use logrows counted header for log stages section

[buildfarm-server.git] / cgi-bin / pgstatus.pl

diff --git a/cgi-bin/pgstatus.pl b/cgi-bin/pgstatus.pl
old mode 100644 (file)
new mode 100755 (executable)
index 576dd38..aa83566
--- a/cgi-bin/pgstatus.pl
+++ b/cgi-bin/pgstatus.pl
@@ -2,6 +2,15 @@
 
 use strict;
 
+use vars qw($dbhost $dbname $dbuser $dbpass $dbport
+       $all_stat $fail_stat $change_stat $green_stat
+       $server_time
+          $min_script_version $min_web_script_version
+);
+
+# force this before we do anything - even load modules
+BEGIN { $server_time = time; }
+
 use CGI;
 use Digest::SHA1  qw(sha1_hex);
 use MIME::Base64;
@@ -11,10 +20,6 @@ use Data::Dumper;
 use Mail::Send;
 use Safe;
 
-use vars qw($dbhost $dbname $dbuser $dbpass $dbport
-       $all_stat $fail_stat $change_stat $green_stat
-);
-
 require "$ENV{BFConfDir}/BuildFarmWeb.pl";
 
 die "no dbname" unless $dbname;
@@ -168,7 +173,56 @@ unless ($sconf =~ s/.*(\$Script_Config)/$1/ms )
 }
 my $client_conf = $container->reval("$sconf;");
 
-my @config_flags = @{ $client_conf->{config_opts} || [] };
+if ($min_script_version)
+{
+       $client_conf->{script_version} ||= '0.0';
+       my ($minmajor,$minminor) = split(/\./,$min_script_version);
+       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
+       {
+               print "Status: 460 script version too low\nContent-Type: text/plain\n\n";
+               print 
+                       "Script version is below minimum required\n",
+                       "Reported version: $client_conf->{script_version},",
+                       "Minumum version required: $min_script_version\n";
+               $db->disconnect;
+               exit;
+       }
+}
+
+if ($min_web_script_version)
+{
+       $client_conf->{web_script_version} ||= '0.0';
+       my ($minmajor,$minminor) = split(/\./,$min_script_version);
+       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
+       {
+               print "Status: 461 web script version too low\nContent-Type: text/plain\n\n";
+               print 
+                       "Web Script version is below minimum required\n",
+                       "Reported version: $client_conf->{web_script_version},",
+                       "Minumum version required: $min_web_script_version\n";
+               $db->disconnect;
+               exit;
+       }
+}
+
+my @config_flags;
+if (not exists $client_conf->{config_opts} )
+{
+       @config_flags = ();
+}
+elsif (ref $client_conf->{config_opts} eq 'HASH')
+{
+       # leave out keys with false values
+       @config_flags = grep { $client_conf->{config_opts}->{$_} } 
+           keys %{$client_conf->{config_opts}};
+}
+elsif (ref $client_conf->{config_opts} eq 'ARRAY' )
+{
+       @config_flags = @{$client_conf->{config_opts}};
+}
+
 if (@config_flags)
 {
     @config_flags = grep {! m/=/ } @config_flags;
@@ -197,7 +251,8 @@ $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(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->execute;
@@ -277,8 +332,10 @@ my $client_events = $client_conf->{mail_events};
 
 if ($ENV{BF_DEBUG})
 {
+       my $client_time = $client_conf->{current_ts};
     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);
 }