From df6616990b883c680e435cdfb1db2d5365c5dae6 Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 11 Aug 2005 20:07:57 +0000 Subject: [PATCH] minor bug fixes and removal of some extra stringifications git-svn-id: svn://svn.open-ils.org/ILS/trunk@1637 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/perlmods/OpenSRF/AppSession.pm | 17 +---------------- OpenSRF/src/perlmods/OpenSRF/Application.pm | 5 ----- .../OpenSRF/DomainObject/oilsMessage.pm | 4 ---- .../OpenSRF/DomainObject/oilsResponse.pm | 6 +++--- OpenSRF/src/perlmods/OpenSRF/Transport.pm | 6 ++---- 5 files changed, 6 insertions(+), 32 deletions(-) diff --git a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm index 25f028ace5..865df94848 100644 --- a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm +++ b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm @@ -504,18 +504,8 @@ sub send { $connecting++; } - if( $payload ) { - $logger->debug( "Payload is ".$payload->toString, INTERNAL ); - } - - my $msg = OpenSRF::DomainObject::oilsMessage->new(); - $logger->debug( "AppSession after creating oilsMessage $msg", INTERNAL ); - $msg->type($msg_type); - $logger->debug( "AppSession after adding type" . $msg->toString(), INTERNAL ); - - #$msg->userAuth($self->client_auth) if ($self->endpoint == CLIENT && $msg_type eq 'CONNECT'); no warnings; $msg->threadTrace( $tT || int($self->session_threadTrace) || int($self->last_threadTrace) ); @@ -923,7 +913,6 @@ sub push_queue { #return; eventually... } push @{ $self->{recv_queue} }, $resp; - OpenSRF::Utils::Logger->debug( "AppRequest pushed ".$resp->toString(), INTERNAL ); } sub failed { @@ -942,11 +931,7 @@ sub payload { return shift()->{payload}; } sub resend { my $self = shift; return unless ($self and $self->session and !$self->complete); - OpenSRF::Utils::Logger->debug( - "I'm resending the request for threadTrace ". $self->threadTrace, DEBUG); - if($self->payload) { - OpenSRF::Utils::Logger->debug($self->payload->toString,INTERNAL); - } + OpenSRF::Utils::Logger->debug( "I'm resending the request for threadTrace ". $self->threadTrace, DEBUG); return $self->session->send('REQUEST', $self->payload, $self->threadTrace ); } diff --git a/OpenSRF/src/perlmods/OpenSRF/Application.pm b/OpenSRF/src/perlmods/OpenSRF/Application.pm index 54e9b9de74..540581560d 100644 --- a/OpenSRF/src/perlmods/OpenSRF/Application.pm +++ b/OpenSRF/src/perlmods/OpenSRF/Application.pm @@ -85,8 +85,6 @@ sub handler { if( $app ) { $log->debug( "Application is $app", DEBUG); } - $log->debug( "Message is ".$app_msg->toString(1), INTERNAL); - if ($session->last_message_type eq 'REQUEST') { $log->debug( "We got a REQUEST: ". $app_msg->method, INFO ); @@ -139,7 +137,6 @@ sub handler { my $time = sprintf '%.3f', time() - $start; $log->debug( "Method duration for {$method_name -> ".join(', ', @args)."}: ". $time, DEBUG ); if( defined( $resp ) ) { - #$log->debug( "Calling respond_complete: ". $resp->toString(), INTERNAL ); $appreq->respond_complete( $resp ); } else { $appreq->status( OpenSRF::DomainObject::oilsConnectStatus->new( @@ -186,7 +183,6 @@ sub handler { $appreq = $aref->[0]; if( ref( $response ) ) { - #$log->debug( "Calling respond_complete: ". $response->toString(), INTERNAL ); $appreq->respond_complete( $response ); } else { $appreq->status( OpenSRF::DomainObject::oilsConnectStatus->new( @@ -219,7 +215,6 @@ sub handler { return 1; } else { - $log->debug( "Pushing ". $app_msg->toString ." onto queue", INTERNAL ); $session->push_queue([ $app_msg, $session->last_threadTrace ]); } diff --git a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm index 320f79a00e..07feb83ec9 100644 --- a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm +++ b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm @@ -246,7 +246,6 @@ sub do_server { $log->debug("Passing to Application::handler()", INFO); - $log->debug($self->toString(1), DEBUG); return 1; @@ -311,9 +310,6 @@ sub do_client { $self->payload->throw(); } - if( $self->payload ) { - $log->debug("Passing to OpenSRF::Application::handler()\n" . $self->payload->toString(1), INTERNAL); - } $log->debug("oilsMessage passing to Application: " . $self->type." : ".$session->remote_id, INFO ); return 1; diff --git a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm index 5e69691162..6009032a05 100644 --- a/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm +++ b/OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm @@ -79,8 +79,8 @@ sub toString { } sub new { - my $name = shift; - $name = ref($class) || $class; + my $class = shift; + $class = ref($class) || $class; my $default_status = eval "\$${class}::status"; my $default_statusCode = eval "\$${class}::statusCode"; @@ -304,7 +304,7 @@ sub message { } sub new { - my $name = shift; + my $class = shift; return $class->OpenSRF::DomainObject::oilsResponse::new( @_ ); } diff --git a/OpenSRF/src/perlmods/OpenSRF/Transport.pm b/OpenSRF/src/perlmods/OpenSRF/Transport.pm index eda097d0e1..21aede812d 100644 --- a/OpenSRF/src/perlmods/OpenSRF/Transport.pm +++ b/OpenSRF/src/perlmods/OpenSRF/Transport.pm @@ -158,11 +158,9 @@ sub handler { # up to the message layer for processing. for my $msg (@$doc) { - $logger->transport( - "Transport::handler()passing to message handler \n".$msg->toString(1), DEBUG ); + $logger->transport( "Transport::handler()passing to message handler", DEBUG ); - $logger->transport( - "Transport passing up ".$msg->type." from ". + $logger->transport( "Transport passing up ".$msg->type." from ". $app_session->remote_id . " with threadTrace [" . $msg->threadTrace."]", INFO ); next unless ( $msg && UNIVERSAL::isa($msg => 'OpenSRF::DomainObject::oilsMessage')); -- 2.43.2