From 07f2fed2f2949fb9e3f7f86c208150841bdeb30f Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Mon, 11 May 2020 00:30:28 +0100 Subject: [PATCH] improve node initialisation debugging --- perl/DXProt.pm | 6 +++--- perl/DXProtHandle.pm | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 4940c910..dc5dc0b9 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -866,11 +866,11 @@ sub send_local_config my @remotenodes; if ($self->{isolate}) { - dbg("send_local_config: isolated"); + dbg("$self->{call} send_local_config: isolated"); @localnodes = ( $main::routeroot ); $self->send_route($main::mycall, \&pc19, 1, $main::routeroot); } elsif ($self->{do_pc9x}) { - dbg("send_local_config: doing pc9x"); + dbg("$self->{call} send_local_config: doing pc9x"); my $node = Route::Node::get($self->{call}); # $self->send_last_pc92_config($main::routeroot); # $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/; @@ -881,7 +881,7 @@ sub send_local_config # and are not themselves isolated, this to make sure that isolated nodes # don't appear outside of this node - dbg("send_local_config: traditional"); + dbg("$self->{call} send_local_config: traditional"); # send locally connected nodes my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes(); diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 57a83cc5..b3278d36 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -624,7 +624,7 @@ sub handle_18 $self->{build} = 0 + $build; $self->user->build(0 + $build); $parent->build(0 + $build); - dbg("DXSpider version $version build $build"); + dbg("$self->{call} = DXSpider version $version build $build"); unless ($self->is_spider) { dbg("Change U " . $self->user->sort . " C $self->{sort} -> S"); $self->user->sort('S'); @@ -633,7 +633,7 @@ sub handle_18 } # $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/; } else { - dbg("Unknown software"); + dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])"); $self->version(50.0); $self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/; $self->user->version($self->version); @@ -641,12 +641,12 @@ sub handle_18 if ($pc->[1] =~ /\bpc9x/) { if ($self->{isolate}) { - dbg("pc9x recognised, but $self->{call} is isolated, using old protocol"); + dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol"); } elsif (!$self->user->wantpc9x) { - dbg("pc9x explicitly switched off on $self->{call}, using old protocol"); + dbg("$self->{call} pc9x explicitly switched off, using old protocol"); } else { $self->{do_pc9x} = 1; - dbg("Do px9x set on $self->{call}"); + dbg("$self->{call} Set do PC9x"); } } -- 2.43.0