From: Dirk Koopman Date: Sun, 26 Apr 2020 23:38:48 +0000 (+0100) Subject: lose some of the annoying uninitialised msgs X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c480ac94da7dbd5762fcd15aa556c874d223e14e;p=spider.git lose some of the annoying uninitialised msgs --- diff --git a/dxspider.service b/dxspider.service index bb81d0e3..d902006c 100644 --- a/dxspider.service +++ b/dxspider.service @@ -1,6 +1,6 @@ [Unit] Description=DXSpider DX Cluster node -After=network.target auditd.service +After=network.target [Service] EnvironmentFile=-/etc/default/dxspider diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 5d16f93d..1dd868c0 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -1323,8 +1323,8 @@ sub spawn_cmd sub { my $subpro = shift; if (isdbg('progress')) { - my $s = "line: $line"; - $s .= ", args: " . join(', ', @$args) if $args && @$args; + my $s = qq{line: "$line"}; + $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args; dbg($s); } eval { @out = $cmdref->(@$args); }; diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 25d5501f..4940c910 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -1234,8 +1234,8 @@ sub spawn_cmd sub { my $subpro = shift; if (isdbg('progress')) { - my $s = "line: $line"; - $s .= ", args: " . join(', ', @$args) if $args && @$args; + my $s = qq{line: "$line"}; + $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args; dbg($s); } eval { @out = $cmdref->(@$args); }; diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 0f7a1ff3..0beabcf2 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -2016,7 +2016,7 @@ sub handle_93 if (isdbg('progress')) { my $vs = $via ne '*' ? " via $via" : ''; - my $s = "ANNTALK: $from\@$onode$via -> $to '$text'"; + my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'"; dbg($s); }