r224@brr: dpavlin | 2007-11-15 00:07:18 +0100

 hush debug ouput

git-svn-id: https://perl-cwmp.googlecode.com/svn/trunk@205 836a5e1a-633d-0410-964b-294494ad4392

diff --git a/lib/CWMP/Server.pm b/lib/CWMP/Server.pm
index 52f9016..5a452c2 100644 (file)
--- a/lib/CWMP/Server.pm
+++ b/lib/CWMP/Server.pm
@@ -135,8 +135,6 @@ sub process_request {
                $sess->{sock} = $sock;
                $sess->{debug} = $prop->{debug};
 
                $sess->{sock} = $sock;
                $sess->{debug} = $prop->{debug};
 

-               warn "## sess = ", dump( $sess );
-

                my $session = CWMP::Session->new( $sess ) || confess "can't create session from ",dump( $sess );
 
                while ( $session->process_request ) {
                my $session = CWMP::Session->new( $sess ) || confess "can't create session from ",dump( $sess );
 
                while ( $session->process_request ) {

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 3139cbb..b971331 100644 (file)
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -204,8 +204,6 @@ If debugging level of 3 or more, it will create dumps of responses named C<< dum
 sub dispatch {
        my $self = shift;
 
 sub dispatch {
        my $self = shift;
 

-warn "##!!! dispatch(",dump( @_ ),")\n";
-

        my $dispatch = shift || die "no dispatch?";
        my $args = shift;
 
        my $dispatch = shift || die "no dispatch?";
        my $args = shift;
 

diff --git a/lib/CWMP/Vendor.pm b/lib/CWMP/Vendor.pm
index 2cf6a01..f09f120 100644 (file)
--- a/lib/CWMP/Vendor.pm
+++ b/lib/CWMP/Vendor.pm
@@ -54,7 +54,7 @@ sub state2serial {
        my $serial = $state->{DeviceID}->{SerialNumber} || die "no serial?";
        my $ip = $state->{Parameter}->{'.ExternalIPAddress'} || die "no ip?";
 
        my $serial = $state->{DeviceID}->{SerialNumber} || die "no serial?";
        my $ip = $state->{Parameter}->{'.ExternalIPAddress'} || die "no ip?";
 

-       warn "## state2serial $serial $ip\n";
+       warn "## state2serial $serial $ip\n" if $debug;

 
        ( $last_ip, $last_serial ) = ( $ip, $serial );
 
 
        ( $last_ip, $last_serial ) = ( $ip, $serial );
 


@@ -63,11 +63,11 @@ sub state2serial {
 
 sub add_triggers {
 
 
 sub add_triggers {
 

-       warn __PACKAGE__, "->add_triggers\n";
+       warn __PACKAGE__, "->add_triggers\n" if $debug;

 
 CWMP::Request->add_trigger( name => 'Fault', callback => sub {
        my ( $self, $state ) = @_;
 
 CWMP::Request->add_trigger( name => 'Fault', callback => sub {
        my ( $self, $state ) = @_;

-       warn "## Fault trigger state = ",dump( $self, $state );
+       warn "## Fault trigger state = ",dump( $self, $state ) if $debug;

        die "can't map fault to serial!" unless $last_serial;
        warn "ERROR: got Fault and ingoring $last_ip $last_serial\n";
        $cpe_faulty->{$last_serial}++;
        die "can't map fault to serial!" unless $last_serial;
        warn "ERROR: got Fault and ingoring $last_ip $last_serial\n";
        $cpe_faulty->{$last_serial}++;


@@ -79,15 +79,15 @@ CWMP::Request->add_trigger( name => 'Inform', callback => sub {
        my ( $serial, $ip ) = state2serial( $state );
 
        if ( $cpe_faulty->{$serial} ) {
        my ( $serial, $ip ) = state2serial( $state );
 
        if ( $cpe_faulty->{$serial} ) {

-               warn "## Inform trigger from $ip $serial -- IGNORED\n"; # if $debug;
+               warn "## Inform trigger from $ip $serial -- IGNORED\n" if $debug;

                return;
        }
 
                return;
        }
 

-       warn "## Inform trigger from $ip $serial\n"; # if $debug;
+       warn "## Inform trigger from $ip $serial\n" if $debug;

 
        my $found = 0;
 
 
        my $found = 0;
 

-       warn "### serial2ip = ",dump( $serial2ip );
+       warn "### serial2ip = ",dump( $serial2ip ) if $debug;

 
        foreach my $target_serial ( keys %$serial2ip ) {
 
 
        foreach my $target_serial ( keys %$serial2ip ) {