[popfile-commit] engine/Proxy Proxy.pm,1.54.4.1,1.54.4.2

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22566

Modified Files:
      Tag: b0_22_2
	Proxy.pm 
Log Message:
Add more logging when connecting to server

Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.54.4.1
retrieving revision 1.54.4.2
diff -C2 -d -r1.54.4.1 -r1.54.4.2
*** Proxy.pm	6 Feb 2006 15:15:53 -0000	1.54.4.1
--- Proxy.pm	16 Nov 2006 19:06:47 -0000	1.54.4.2
***************
*** 221,225 ****
                  $self->{api_session__} =
                      $self->{classifier__}->get_session_key( 'admin', '' );
! 	    }
  
              # Check that this is a connection from the local machine,
--- 221,225 ----
                  $self->{api_session__} =
                      $self->{classifier__}->get_session_key( 'admin', '' );
!             }
  
              # Check that this is a connection from the local machine,
***************
*** 252,256 ****
                          exit(0) if ( defined( $pid ) );
                      }
! 	        } else {
                      pipe my $reader, my $writer;
  
--- 252,256 ----
                          exit(0) if ( defined( $pid ) );
                      }
!                 } else {
                      pipe my $reader, my $writer;
  
***************
*** 333,339 ****
          }
  
! 	if ( $line =~ $regexp ) {
              last;
! 	}
      }
  }
--- 333,339 ----
          }
  
!         if ( $line =~ $regexp ) {
              last;
!         }
      }
  }
***************
*** 451,455 ****
          if ( $response =~ /$self->{good_response_}/ ) {
              return 0;
! 	} else {
              return 1;
          }
--- 451,455 ----
          if ( $response =~ /$self->{good_response_}/ ) {
              return 0;
!         } else {
              return 1;
          }
***************
*** 492,495 ****
--- 492,498 ----
                      ConnectAddr  => $hostname,
                      ConnectPort  => $port ); # PROFILE BLOCK STOP
+         $self->log_( 0, "Attempting to connect to socks server at " 
+                     . $self->config_( 'socks_server' ) . ":" 
+                     . ProxyPort => $self->config_( 'socks_port' ) );
      } else {
          if ( $ssl ) {
***************
*** 499,507 ****
                          PeerAddr => $hostname,
                          PeerPort => $port ); # PROFILE BLOCK STOP
! 	} else {
              $mail = IO::Socket::INET->new( # PROFILE BLOCK START
                          Proto    => "tcp",
                          PeerAddr => $hostname,
                          PeerPort => $port ); # PROFILE BLOCK STOP
          }
      }
--- 502,515 ----
                          PeerAddr => $hostname,
                          PeerPort => $port ); # PROFILE BLOCK STOP
!             $self->log_( 0, "Attempting to connect to SSL server at " 
!                         . "$hostname:$port" );
!         
!         } else {
              $mail = IO::Socket::INET->new( # PROFILE BLOCK START
                          Proto    => "tcp",
                          PeerAddr => $hostname,
                          PeerPort => $port ); # PROFILE BLOCK STOP
+             $self->log_( 0, "Attempting to connect to POP server at " 
+                         . "$hostname:$port" );
          }
      }
***************
*** 518,522 ****
              if ( !$ssl ) {
                  binmode( $mail );
! 	    }
  
              # Wait 10 seconds for a response from the remote server and if
--- 526,530 ----
              if ( !$ssl ) {
                  binmode( $mail );
!             }
  
              # Wait 10 seconds for a response from the remote server and if