using OO syntax

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@126 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/examples/math_bench.pl b/examples/math_bench.pl
index 471de0e..c5a4d48 100755 (executable)
--- a/examples/math_bench.pl
+++ b/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/src/perlmods/OpenSRF/System.pm b/src/perlmods/OpenSRF/System.pm
index 5e70aca..36a65cb 100644 (file)
--- a/src/perlmods/OpenSRF/System.pm
+++ b/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/src/perlmods/OpenSRF/UnixServer.pm b/src/perlmods/OpenSRF/UnixServer.pm
index 61f59b3..02c3aa7 100644 (file)
--- a/src/perlmods/OpenSRF/UnixServer.pm
+++ b/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/src/perlmods/OpenSRF/Utils/SettingsClient.pm b/src/perlmods/OpenSRF/Utils/SettingsClient.pm
index 571a22d..6dccf12 100755 (executable)
--- a/src/perlmods/OpenSRF/Utils/SettingsClient.pm
+++ b/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;