turn of param logging for the build_status and build_status_log tables, to avoid...

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

diff --git a/trunk/cgi-bin/pgstatus.pl b/trunk/cgi-bin/pgstatus.pl
index a416f2700dc570e6e0af3665a1e28649ef41fefa..5291b0eea024a183850a46b8590d15d8735ff044 100755 (executable)
--- a/trunk/cgi-bin/pgstatus.pl
+++ b/trunk/cgi-bin/pgstatus.pl
@@ -239,20 +239,21 @@ if ($min_script_version)
        }
 }
 
-if ($min_web_script_version)
+if ($min_web_script_version && ! ($client_conf->{script_version} eq 'REL_4.3'))
 {
        $client_conf->{web_script_version} ||= '0.0';
        my $cli_ver = $client_conf->{web_script_version} ;
        $cli_ver =~ s/^REL_//;
-       my ($minmajor,$minminor) = split(/\./,$min_script_version);
+       my ($minmajor,$minminor) = split(/\./,$min_web_script_version);
        my ($smajor,$sminor) = split(/\./,$cli_ver);
        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";
+                       "Reported version: $client_conf->{web_script_version}, ",
+                       "Minumum version required: $min_web_script_version\n"
+                       ;
                $db->disconnect;
                exit;
        }
@@ -294,6 +295,16 @@ my $logst = <<EOSQL;
     values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 EOSQL
 ;
+
+
+# this transaction lets us set log_error_verbosity to terse
+# just for the duration of the transaction. That turns off logging the
+# bind params, so all the logs don't get stuffed on the postgres logs
+
+$db->begin_work;
+$db->do("select set_local_error_terse()");
+
+
 $sth=$db->prepare($logst);
 
 $sth->bind_param(1,$animal);
@@ -317,6 +328,8 @@ $sth->bind_param(16,$frozen_sconf,{ pg_type => DBD::Pg::PG_BYTEA });
 $sth->execute;
 $sth->finish;
 
+
+
 my $logst2 = <<EOSQL;
 
   insert into build_status_log 
@@ -347,9 +360,10 @@ foreach my $log_file( @log_file_names )
                  "$stage_interval seconds");
 }
 
-
 $sth->finish;
 
+$db->commit;
+
 my $prevst = <<EOSQL;
 
   select coalesce((select distinct on (snapshot) stage