From 7b31bba1c687a923009ed20a538ee6c6bfafb25c Mon Sep 17 00:00:00 2001 From: miker Date: Mon, 28 Feb 2005 20:51:33 +0000 Subject: [PATCH] using OO syntax git-svn-id: svn://svn.open-ils.org/ILS/trunk@147 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/examples/math_bench.pl | 2 +- OpenSRF/src/perlmods/OpenSRF/System.pm | 3 ++- OpenSRF/src/perlmods/OpenSRF/UnixServer.pm | 2 +- OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSRF/examples/math_bench.pl b/OpenSRF/examples/math_bench.pl index 471de0e1dd..c5a4d48c8f 100755 --- a/OpenSRF/examples/math_bench.pl +++ b/OpenSRF/examples/math_bench.pl @@ -26,7 +26,7 @@ unless( $count ) { warn "PID: $$\n"; -OpenSRF::System::bootstrap_client(); +OpenSRF::System->bootstrap_client(); my $session = OpenSRF::AppSession->create( "math" ); try { diff --git a/OpenSRF/src/perlmods/OpenSRF/System.pm b/OpenSRF/src/perlmods/OpenSRF/System.pm index 5e70aca469..36a65cb297 100644 --- a/OpenSRF/src/perlmods/OpenSRF/System.pm +++ b/OpenSRF/src/perlmods/OpenSRF/System.pm @@ -55,7 +55,7 @@ $SIG{INT} = sub { instance()->killall(); }; $SIG{HUP} = sub{ instance()->hupall(); }; -$SIG{CHLD} = \&process_automation; +#$SIG{CHLD} = \&process_automation; { @@ -228,6 +228,7 @@ sub bootstrap { # Bootstraps a single client connection. sub bootstrap_client { + my $self = shift; my %params = @_; diff --git a/OpenSRF/src/perlmods/OpenSRF/UnixServer.pm b/OpenSRF/src/perlmods/OpenSRF/UnixServer.pm index 61f59b3d24..02c3aa7ed0 100644 --- a/OpenSRF/src/perlmods/OpenSRF/UnixServer.pm +++ b/OpenSRF/src/perlmods/OpenSRF/UnixServer.pm @@ -173,7 +173,7 @@ sub configure_hook { my $app = $self->app; # boot a client - OpenSRF::System::bootstrap_client( client_name => "system_client" ); + OpenSRF::System->bootstrap_client( client_name => "system_client" ); $logger->debug( "Setting application implementaion for $app", DEBUG ); my $client = OpenSRF::Utils::SettingsClient->new(); diff --git a/OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm b/OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm index 571a22db47..6dccf129dd 100755 --- a/OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm +++ b/OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm @@ -65,7 +65,7 @@ sub grab_host_config { my $host = shift; warn "Grabbing Host config for $host\n"; - OpenSRF::System::bootstrap_client(client_name => "system_client"); + OpenSRF::System->bootstrap_client(client_name => "system_client"); $session = OpenSRF::AppSession->create( "settings" ) unless $session; my $bsconfig = OpenSRF::Utils::Config->current; -- 2.43.2