From ef0c5ae3082ff7915630e34cfacb7232920e3d8d Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sat, 18 Dec 2010 17:44:28 +0000 Subject: [PATCH] Remove use of Safe.pm now all clients are sending a frozen version of their config. --- trunk/cgi-bin/pgstatus.pl | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/trunk/cgi-bin/pgstatus.pl b/trunk/cgi-bin/pgstatus.pl index 5291b0e..c9b0268 100755 --- a/trunk/cgi-bin/pgstatus.pl +++ b/trunk/cgi-bin/pgstatus.pl @@ -19,7 +19,6 @@ use DBI; use DBD::Pg; use Data::Dumper; use Mail::Send; -use Safe; use Time::ParseDate; use Storable qw(thaw); @@ -209,16 +208,6 @@ if ($frozen_sconf) { $client_conf = thaw $frozen_sconf; } -else -{ - my $container = new Safe; - my $sconf = $conf; - unless ($sconf =~ s/.*(\$Script_Config)/$1/ms ) - { - $sconf = '$Script_Config={};'; - } - $client_conf = $container->reval("$sconf;"); -} if ($min_script_version) { @@ -239,7 +228,7 @@ if ($min_script_version) } } -if ($min_web_script_version && ! ($client_conf->{script_version} eq 'REL_4.3')) +if ($min_web_script_version) { $client_conf->{web_script_version} ||= '0.0'; my $cli_ver = $client_conf->{web_script_version} ; -- 2.30.2