lose some of the annoying uninitialised msgs
authorDirk Koopman <djk@tobit.co.uk>
Sun, 26 Apr 2020 23:38:48 +0000 (00:38 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Sun, 26 Apr 2020 23:38:48 +0000 (00:38 +0100)
dxspider.service
perl/DXCommandmode.pm
perl/DXProt.pm
perl/DXProtHandle.pm

index bb81d0e3503b2aa6f0581660125d2910e3c75ce5..d902006c4aa4ac89744827442299e7ccee920875 100644 (file)
@@ -1,6 +1,6 @@
 [Unit]
 Description=DXSpider DX Cluster node
-After=network.target auditd.service
+After=network.target
 
 [Service]
 EnvironmentFile=-/etc/default/dxspider
index 5d16f93d58594e0a467cf6933f662098e8ca5471..1dd868c0aa79600c371307b1224513decb25e492 100644 (file)
@@ -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); };
index 25d5501fef9a5342c647f8a42f2c51d0eca5ac90..4940c9102116050b86eae9604fafc732b34d849b 100644 (file)
@@ -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); };
index 0f7a1ff381c08c409a9c98eec162ca1908076ceb..0beabcf224b11d3697bfe76f4d86bab5aa1d1a22 100644 (file)
@@ -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);
        }