From 6324a76dc93bff387fe20bd621d1fa3acfaa39eb Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 5 Apr 2006 21:09:14 +0000 Subject: [PATCH] removing session cache; adding support for quiet remote exceptions git-svn-id: svn://svn.open-ils.org/ILS/trunk@3574 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/perlmods/OpenSRF/AppSession.pm | 75 ++++++------------- .../OpenSRF/DomainObject/oilsMessage.pm | 6 +- 2 files changed, 26 insertions(+), 55 deletions(-) diff --git a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm index 97a6170d4b..9afb0037f1 100644 --- a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm +++ b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm @@ -24,15 +24,8 @@ our %EXPORT_TAGS = ( state => [ qw/CONNECTING INIT_CONNECTED CONNECTED DISCONNEC my $logger = "OpenSRF::Utils::Logger"; our %_CACHE; -our @_CLIENT_CACHE; our @_RESEND_QUEUE; -sub kill_client_session_cache { - for my $session ( @_CLIENT_CACHE ) { - $session->kill_me; - } -} - sub CONNECTING { return 3 }; sub INIT_CONNECTED { return 4 }; sub CONNECTED { return 1 }; @@ -46,14 +39,6 @@ sub find { return $_CACHE{$_[1]} if (exists($_CACHE{$_[1]})); } -sub find_client { - my( $self, $app ) = @_; - $logger->debug( "Client Cache contains: " .scalar(@_CLIENT_CACHE), INTERNAL ); - my ($client) = grep { $_->[0] eq $app and $_->[1] == 1 } @_CLIENT_CACHE; - $client->[1] = 0; - return $client->[2]; -} - sub transport_connected { my $self = shift; if( ! exists $self->{peer_handle} || ! $self->{peer_handle} ) { @@ -86,11 +71,6 @@ sub buffer_reset { } -sub client_cache { - my $self = shift; - push @_CLIENT_CACHE, [ $self->app, 1, $self ]; -} - # when any incoming data is received, this method is called. sub server_build { my $class = shift; @@ -210,7 +190,9 @@ sub get_app_targets { sub stateless { my $self = shift; - if($self) {return $self->{stateless};} + my $state = shift; + $self->{stateless} = $state if (defined $state); + return $self->{stateless}; } # When we're a client and we want to connect to a remote service @@ -222,16 +204,12 @@ sub create { $class = ref($class) || $class; my $app = shift; + my $api_level = shift; + my $quiet = shift; - - - if( my $thingy = OpenSRF::AppSession->find_client( $app ) ) { - $logger->debug( - "AppSession returning existing client session for $app", DEBUG ); - return $thingy; - } else { - $logger->debug( "AppSession creating new client session for $app", DEBUG ); - } + $api_level = 1 if (!defined($api_level)); + + $logger->debug( "AppSession creating new client session for $app", DEBUG ); my $stateless = 0; my $c = OpenSRF::Utils::SettingsClient->new(); @@ -262,16 +240,22 @@ sub create { state => DISCONNECTED,#since we're init'ing session_id => $sess_id, remote_id => $r_id, - api_level => 1, + raise_error => $quiet ? 0 : 1, + api_level => $api_level, orig_remote_id => $r_id, peer_handle => $peer_handle, session_threadTrace => 0, stateless => $stateless, } => $class; - $self->client_cache(); - $_CACHE{$sess_id} = $self; - return $self->find_client( $app ); + return $_CACHE{$sess_id} = $self; +} + +sub raise_remote_errors { + my $self = shift; + my $err = shift; + $self->{raise_error} = $err if (defined $err); + return $self->{raise_error}; } sub api_level { @@ -318,7 +302,6 @@ sub connect { $self = $class->create($app, @_) if (!ref($self)); - return undef unless ($self); $self->{api_level} = $api_level; @@ -327,6 +310,7 @@ sub connect { $self->state(CONNECTING); $self->send('CONNECT', ""); + # if we want to connect to settings, we may not have # any data for the settings client to work with... # just using a default for now XXX @@ -354,6 +338,8 @@ sub connect { return undef unless($self->state == CONNECTED); + $self->stateless(0); + return $self; } @@ -362,12 +348,6 @@ sub finish { if( ! $self->session_id ) { return 0; } - #$self->disconnect if ($self->endpoint == CLIENT); - for my $ses ( @_CLIENT_CACHE ) { - if ($ses->[2]->session_id eq $self->session_id) { - $ses->[1] = 1; - } - } } sub unregister_callback { @@ -403,12 +383,6 @@ sub kill_me { $self->disconnect; $logger->transport( "AppSession killing self: " . $self->session_id(), DEBUG ); - my @a; - for my $ses ( @_CLIENT_CACHE ) { - push @a, $ses - if ($ses->[2]->session_id ne $self->session_id); - } - @_CLIENT_CACHE = @a; delete $_CACHE{$self->session_id}; delete($$self{$_}) for (keys %$self); } @@ -423,12 +397,7 @@ sub disconnect { } } - if( $self->stateless and $self->state != CONNECTED ) { - $self->reset; - return; - } - - unless( $self->state == DISCONNECTED ) { + if ( !$self->stateless and $self->state != DISCONNECTED ) { $self->send('DISCONNECT', "") if ($self->endpoint == CLIENT); $self->state( DISCONNECTED ); } diff --git a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm index 09c0126435..fc0a2996a9 100644 --- a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm +++ b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm @@ -304,8 +304,10 @@ sub do_client { # This should be changed to check the type of response (is it a connectException?, etc.) } - if( $self->payload and $self->payload->isa( "OpenSRF::EX" ) ) { - $self->payload->throw(); + if( $self->payload and $self->payload->isa( "ERROR" ) ) { + if ($session->raise_error) { + $self->payload->throw(); + } } $log->debug("oilsMessage passing to Application: " . $self->type." : ".$session->remote_id ); -- 2.43.2