Changeset 763

Show
Ignore:
Timestamp:
09/23/07 00:17:11 (1 year ago)
Author:
bradfitz
Message:

Michael Scherer <misc@mandriva.org>: more helpful error
messages in logs after dialback failure (shows hosts in question)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/DJabberd/CHANGES

    r757 r763  
     1  - Michael Scherer <misc@mandriva.org>: more helpful error 
     2    messages in logs after dialback failure (shows hosts in question) 
     3 
    14  - don't leak UDP sockets on DNS SRV lookup timeouts 
    25 
  • trunk/DJabberd/lib/DJabberd/Connection/ServerIn.pm

    r498 r763  
    111111 
    112112sub dialback_verify_invalid { 
    113     my ($self, $reason) = @_; 
    114     warn "Dialback verify invalid for $self, reason: $reason\n"; 
     113    my $self = shift; 
     114    my %opts = @_; 
     115 
     116    $self->log->warn("Dialback verify invalid for $self, from $opts{orig_server} to $opts{recv_server}, reason: $opts{reason}"); 
    115117    $self->close_stream; 
    116118} 
     
    128130 
    129131sub dialback_result_invalid { 
    130     my ($self, $reason) = @_; 
    131     $self->log->warn("Dialback result invalid for $self, reason: $reason"); 
     132    my $self = shift; 
     133    my %opts = @_; 
     134 
     135    $self->log->warn("Dialback result invalid for $self, from $opts{orig_server} to $opts{recv_server}, reason: $opts{reason}"); 
    132136    $self->close_stream; 
    133137} 
  • trunk/DJabberd/lib/DJabberd/Stanza/DialbackResult.pm

    r481 r763  
    4444        fail => sub { 
    4545            my ($self_cb, $reason) = @_; 
    46             $conn->dialback_result_invalid($reason);; 
     46            $conn->dialback_result_invalid(reason => $reason, 
     47                                           orig_server => $orig_server,  
     48                                           recv_server => $recv_server); 
    4749        }, 
    4850    }); 
  • trunk/DJabberd/lib/DJabberd/Stanza/DialbackVerify.pm

    r297 r763  
    5454                                on_failure => sub { 
    5555                                    $logger->warn("Dialback verify success for connection $conn->{id}"); 
    56                                     $conn->dialback_verify_invalid; 
     56                                    $conn->dialback_verify_invalid(recv_server => $self->recv_server, 
     57                                                                   orig_server => $self->orig_server); 
    5758                                }); 
    5859}