projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redo ffff remove on pc92 a
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 6306b7fbed905902abea96f23d9a14c219e98e31..1dd868c0aa79600c371307b1224513decb25e492 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-210,8
+210,7
@@
sub start
$script->run($self) if $script;
# send cluster info
$script->run($self) if $script;
# send cluster info
- my $info = Route::cluster();
- $self->send("Cluster:$info");
+ $self->send($self->run_cmd("show/cluster"));
# send prompts for qth, name and things
$self->send($self->msg('namee1')) if !$user->name;
# send prompts for qth, name and things
$self->send($self->msg('namee1')) if !$user->name;
@@
-545,9
+544,6
@@
sub run_cmd
if ($package && $self->can("${package}::handle")) {
no strict 'refs';
dbg("cmd: package $package") if isdbg('command');
if ($package && $self->can("${package}::handle")) {
no strict 'refs';
dbg("cmd: package $package") if isdbg('command');
- if (isdbg('progress')) {
- my $s = "CMD: '$cmd' by $call ip $self->{hostname}";
- }
my $t0 = [gettimeofday];
eval { @ans = &{"${package}::handle"}($self, $args) };
if ($@) {
my $t0 = [gettimeofday];
eval { @ans = &{"${package}::handle"}($self, $args) };
if ($@) {
@@
-1327,8
+1323,8
@@
sub spawn_cmd
sub {
my $subpro = shift;
if (isdbg('progress')) {
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); };
dbg($s);
}
eval { @out = $cmdref->(@$args); };