git://git.exim.org
/
buildfarm-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow for configured git url
[buildfarm-server.git]
/
cgi-bin
/
pgstatus.pl
diff --git
a/cgi-bin/pgstatus.pl
b/cgi-bin/pgstatus.pl
index 61fea2e14ecc9b3c920d816cf4a2bd4d43e07e03..df499f5fedb6542b972d34e4568257cc17a273ad 100755
(executable)
--- a/
cgi-bin/pgstatus.pl
+++ b/
cgi-bin/pgstatus.pl
@@
-230,13
+230,15
@@
if (@config_flags)
$config_flags = '{' . join(',',@config_flags) . '}' ;
}
$config_flags = '{' . join(',',@config_flags) . '}' ;
}
+my $scm = $client_conf->{scm} || 'cvs';
+my $scmurl = $client_conf->{scm_url};
my $logst = <<EOSQL;
insert into build_status
(sysname, snapshot,status, stage, log,conf_sum, branch,
changed_this_run, changed_since_success,
my $logst = <<EOSQL;
insert into build_status
(sysname, snapshot,status, stage, log,conf_sum, branch,
changed_this_run, changed_since_success,
- log_archive_filenames , log_archive, build_flags)
- values(?,?,?,?,?,?,?,?,?,?,?,?)
+ log_archive_filenames , log_archive, build_flags
, scm, scmurl
)
+ values(?,?,?,?,?,?,?,?,?,?,?,?
,?
)
EOSQL
;
$sth=$db->prepare($logst);
EOSQL
;
$sth=$db->prepare($logst);
@@
-251,8
+253,11
@@
$sth->bind_param(7,$branch);
$sth->bind_param(8,$changed_this_run);
$sth->bind_param(9,$changed_since_success);
$sth->bind_param(10,$log_file_names);
$sth->bind_param(8,$changed_this_run);
$sth->bind_param(9,$changed_since_success);
$sth->bind_param(10,$log_file_names);
-$sth->bind_param(11,$log_archive,{ pg_type => DBD::Pg::PG_BYTEA });
+#$sth->bind_param(11,$log_archive,{ pg_type => DBD::Pg::PG_BYTEA });
+$sth->bind_param(11,undef,{ pg_type => DBD::Pg::PG_BYTEA });
$sth->bind_param(12,$config_flags);
$sth->bind_param(12,$config_flags);
+$sth->bind_param(13,$scm);
+$sth->bind_param(13,$scmurl);
$sth->execute;
$sth->finish;
$sth->execute;
$sth->finish;
@@
-281,6
+286,7
@@
foreach my $log_file( @log_file_names )
$stage_start = $mtime;
my $ltext = <$handle>;
close($handle);
$stage_start = $mtime;
my $ltext = <$handle>;
close($handle);
+ $ltext =~ s/\x00/\\0/g;
$sth->execute($animal,$dbdate,$branch,$log_file,$ltext,
"$stage_interval seconds");
}
$sth->execute($animal,$dbdate,$branch,$log_file,$ltext,
"$stage_interval seconds");
}
@@
-321,6
+327,12
@@
$row=$sth->fetchrow_arrayref;
my ($os, $compiler,$arch) = @$row;
$sth->finish;
my ($os, $compiler,$arch) = @$row;
$sth->finish;
+
+$db->begin_work;
+$db->do("truncate dashboard_mat");
+$db->do("insert into dashboard_mat select * from dashboard_mat_data");
+$db->commit;
+
$db->disconnect;
print "Content-Type: text/plain\n\n";
$db->disconnect;
print "Content-Type: text/plain\n\n";