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
clean up view name
[buildfarm-server.git]
/
cgi-bin
/
pgstatus.pl
diff --git
a/cgi-bin/pgstatus.pl
b/cgi-bin/pgstatus.pl
index 1fe9e7f017d259011e6d03ae1b43af75c25519be..c1da0a96fc80f95f0a0eed4b1648e70730621646 100755
(executable)
--- a/
cgi-bin/pgstatus.pl
+++ b/
cgi-bin/pgstatus.pl
@@
-62,6
+62,15
@@
unless ($animal && $ts && $stage && $sig)
}
}
+unless ($branch =~ /^(HEAD|REL\d+_\d+_STABLE)$/)
+{
+ print
+ "Status: 492 bad branch parameter $branch\nContent-Type: text/plain\n\n",
+ "bad branch parameter $branch\n";
+ exit;
+
+}
+
my $db = DBI->connect($dsn,$dbuser,$dbpass);
my $db = DBI->connect($dsn,$dbuser,$dbpass);
@@
-74,6
+83,8
@@
$sth->execute($animal);
my ($secret)=$sth->fetchrow_array();
$sth->finish;
my ($secret)=$sth->fetchrow_array();
$sth->finish;
+my $tsdiff = time - $ts;
+
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($ts);
$year += 1900; $mon +=1;
my $date=
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($ts);
$year += 1900; $mon +=1;
my $date=
@@
-84,6
+95,7
@@
if ($ENV{BF_DEBUG} || ($ts > time) || ($ts + 86400 < time ) || (! $secret) )
open(TX,">../buildlogs/$animal.$date");
print TX "sig=$sig\nlogtar-len=" , length($log_archive),
"\nstatus=$res\nstage=$stage\nconf:\n$conf\n",
open(TX,">../buildlogs/$animal.$date");
print TX "sig=$sig\nlogtar-len=" , length($log_archive),
"\nstatus=$res\nstage=$stage\nconf:\n$conf\n",
+ "tsdiff:$tsdiff\n",
"changed_this_run:\n$changed_this_run\n",
"changed_since_success:\n$changed_since_success\n",
"log:\n",$log;
"changed_this_run:\n$changed_this_run\n",
"changed_since_success:\n$changed_since_success\n",
"log:\n",$log;
@@
-91,7
+103,7
@@
if ($ENV{BF_DEBUG} || ($ts > time) || ($ts + 86400 < time ) || (! $secret) )
close(TX);
}
close(TX);
}
-unless ($ts < time)
+unless ($ts < time
+ 120
)
{
my $gmt = gmtime($ts);
print "Status: 491 bad ts parameter - $ts ($gmt GMT) is in the future.\n",
{
my $gmt = gmtime($ts);
print "Status: 491 bad ts parameter - $ts ($gmt GMT) is in the future.\n",
@@
-227,16
+239,19
@@
if (@config_flags)
{
@config_flags = grep {! m/=/ } @config_flags;
map {s/\s+//g; $_=qq("$_"); } @config_flags;
{
@config_flags = grep {! m/=/ } @config_flags;
map {s/\s+//g; $_=qq("$_"); } @config_flags;
+ push @config_flags,'git' if $client_conf->{scm} eq 'git';
$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);
@@
-254,6
+269,8
@@
$sth->bind_param(10,$log_file_names);
#$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(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(13,$scm);
+$sth->bind_param(14,$scmurl);
$sth->execute;
$sth->finish;
$sth->execute;
$sth->finish;
@@
-323,9
+340,8
@@
$row=$sth->fetchrow_arrayref;
my ($os, $compiler,$arch) = @$row;
$sth->finish;
my ($os, $compiler,$arch) = @$row;
$sth->finish;
-
$db->begin_work;
$db->begin_work;
-$db->do("
truncate
dashboard_mat");
+$db->do("
delete from
dashboard_mat");
$db->do("insert into dashboard_mat select * from dashboard_mat_data");
$db->commit;
$db->do("insert into dashboard_mat select * from dashboard_mat_data");
$db->commit;