git://git.exim.org
/
buildfarm-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac9a9d
)
fix dashboard duplication, use ablsolute path for buildlogs
author
Andrew Dunstan
<andrew@dunslane.net>
Fri, 29 Oct 2010 02:57:57 +0000
(
02:57
+0000)
committer
Andrew Dunstan
<andrew@dunslane.net>
Fri, 29 Oct 2010 02:57:57 +0000
(
02:57
+0000)
trunk/cgi-bin/pgstatus.pl
patch
|
blob
|
history
diff --git
a/trunk/cgi-bin/pgstatus.pl
b/trunk/cgi-bin/pgstatus.pl
index f36a65980af6b003c78dd570e8bd8e0afc846a65..d78aad0870acd019112fddf3780746e076724dc6 100755
(executable)
--- a/
trunk/cgi-bin/pgstatus.pl
+++ b/
trunk/cgi-bin/pgstatus.pl
@@
-23,6
+23,7
@@
use Safe;
use Time::ParseDate;
require "$ENV{BFConfDir}/BuildFarmWeb.pl";
use Time::ParseDate;
require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+my $buildlogs = "$ENV{BFConfDir}/buildlogs";
die "no dbname" unless $dbname;
die "no dbuser" unless $dbuser;
die "no dbname" unless $dbname;
die "no dbuser" unless $dbuser;
@@
-94,7
+95,7
@@
my $date=
if ($ENV{BF_DEBUG} || ($ts > time) || ($ts + 86400 < time ) || (! $secret) )
{
if ($ENV{BF_DEBUG} || ($ts > time) || ($ts + 86400 < time ) || (! $secret) )
{
- open(TX,">
../
buildlogs/$animal.$date");
+ 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",
print TX "sig=$sig\nlogtar-len=" , length($log_archive),
"\nstatus=$res\nstage=$stage\nconf:\n$conf\n",
"tsdiff:$tsdiff\n",
@@
-172,12
+173,12
@@
my $dbdate=
my $log_file_names;
my @log_file_names;
my $log_file_names;
my @log_file_names;
-my $dirname = "
../
buildlogs/tmp.$$.unpacklogs";
+my $dirname = "
$
buildlogs/tmp.$$.unpacklogs";
if ($log_archive)
{
my $log_handle;
if ($log_archive)
{
my $log_handle;
- my $archname = "
../
buildlogs/tmp.$$.tgz";
+ my $archname = "
$
buildlogs/tmp.$$.tgz";
open($log_handle,">$archname");
binmode $log_handle;
print $log_handle $log_archive;
open($log_handle,">$archname");
binmode $log_handle;
print $log_handle $log_archive;
@@
-356,6
+357,8
@@
my ($os, $compiler,$arch) = @$row;
$sth->finish;
$db->begin_work;
$sth->finish;
$db->begin_work;
+# prevent occasional duplication by forcing serialization of this operation
+$db->do("lock table dashboard_mat in share row exclusive mode");
$db->do("delete from dashboard_mat");
$db->do("insert into dashboard_mat select * from dashboard_mat_data");
$db->commit;
$db->do("delete from dashboard_mat");
$db->do("insert into dashboard_mat select * from dashboard_mat_data");
$db->commit;
@@
-371,7
+374,7
@@
my $client_events = $client_conf->{mail_events};
if ($ENV{BF_DEBUG})
{
my $client_time = $client_conf->{current_ts};
if ($ENV{BF_DEBUG})
{
my $client_time = $client_conf->{current_ts};
- open(TX,">>
../
buildlogs/$animal.$date");
+ open(TX,">>
$
buildlogs/$animal.$date");
print TX "\n",Dumper(\$client_conf),"\n";
print TX "server time: $server_time, client time: $client_time\n" if $client_time;
close(TX);
print TX "\n",Dumper(\$client_conf),"\n";
print TX "server time: $server_time, client time: $client_time\n" if $client_time;
close(TX);