GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-16 21:40:46 +01:00
Code Issues Projects Releases Wiki Activity

Significant clean-up of log output for command invocations

Browse Source
This commit is contained in:
Pragmatic Software 2020-02-05 01:09:43 -08:00
parent 6453ff220e
commit 3162660cf9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PBot/Interpreter.pm
View File

@ -200,7 +200,7 @@ sub interpret {
my $text; my $text;
my $pbot = $self->{pbot}; my $pbot = $self->{pbot};
$pbot->{logger}->log("=== Enter interpret_command: [" . (defined $stuff->{from} ? $stuff->{from} : "(undef)") . "][$stuff->{nick}!$stuff->{user}\@$stuff->{host}][$stuff->{interpret_depth}][$stuff->{command}]\n"); $pbot->{logger}->log("=== [$stuff->{interpret_depth}] Got command: (" . (defined $stuff->{from} ? $stuff->{from} : "undef") . ") $stuff->{nick}!$stuff->{user}\@$stuff->{host}: $stuff->{command}\n");
$stuff->{special} = "" unless exists $self->{special}; $stuff->{special} = "" unless exists $self->{special};
@ -302,7 +302,7 @@ sub interpret {
}; };
$self->add_message_to_output_queue($stuff->{from}, $message, $delay); $self->add_message_to_output_queue($stuff->{from}, $message, $delay);
$delay = duration($delay); $delay = duration($delay);
$self->{pbot}->{logger}->log("Final result ($delay delay) [$message->{message}]\n"); $self->{pbot}->{logger}->log("($delay delay) [$message->{message}]\n");
return undef; return undef;
} }
} }
@ -776,9 +776,7 @@ sub handle_result {
$self->{pbot}->{logger}->log(Dumper $stuff); $self->{pbot}->{logger}->log(Dumper $stuff);
} }
if (not defined $result or length $result == 0) { return 0 if not defined $result or length $result == 0;
return 0;
}
if ($result =~ s#^(/say|/me) ##) { if ($result =~ s#^(/say|/me) ##) {
$stuff->{prepend} = $1; $stuff->{prepend} = $1;
@ -889,7 +887,7 @@ sub handle_result {
}; };
$self->add_message_to_output_queue($stuff->{from}, $message, 0); $self->add_message_to_output_queue($stuff->{from}, $message, 0);
} else { } else {
$self->{pbot}->{conn}->privmsg($stuff->{from}, "And that's all I have to say about that. See $link for full text."); $self->{pbot}->{conn}->privmsg($stuff->{from}, "And that's all I have to say about that. See $link for full text.") unless $stuff->{from} =~ /stdin\@pbot$/;
} }
last; last;
} }
@ -908,11 +906,11 @@ sub handle_result {
}; };
$self->add_message_to_output_queue($stuff->{from}, $message, $delay); $self->add_message_to_output_queue($stuff->{from}, $message, $delay);
$delay = duration($delay); $delay = duration($delay);
$self->{pbot}->{logger}->log("Final result ($delay delay) [$line]\n"); $self->{pbot}->{logger}->log("($delay delay) $line\n");
} else { } else {
$stuff->{line} = $line; $stuff->{line} = $line;
$self->output_result($stuff); $self->output_result($stuff);
$self->{pbot}->{logger}->log("Final result: [$line]\n"); $self->{pbot}->{logger}->log("$line\n");
} }
} }
$self->{pbot}->{logger}->log("---------------------------------------------\n"); $self->{pbot}->{logger}->log("---------------------------------------------\n");
@ -933,6 +931,7 @@ sub output_result {
my $line = $stuff->{line}; my $line = $stuff->{line};
return if not defined $line or not length $line; return if not defined $line or not length $line;
return 0 if $stuff->{from} =~ /stdin\@pbot$/;
if ($line =~ s/^\/say\s+//i) { if ($line =~ s/^\/say\s+//i) {
if (defined $stuff->{nickoverride} and ($stuff->{no_nickoverride} == 0 or $stuff->{force_nickoverride} == 1)) { if (defined $stuff->{nickoverride} and ($stuff->{no_nickoverride} == 0 or $stuff->{force_nickoverride} == 1)) {

2
PBot/StdinReader.pm
View File

@ -61,7 +61,7 @@ sub stdin_reader {
$from = $1; $from = $1;
$text = $self->{pbot}->{registry}->get_value('irc', 'botnick') . " $2"; $text = $self->{pbot}->{registry}->get_value('irc', 'botnick') . " $2";
} else { } else {
$from = $self->{pbot}->{registry}->get_value('irc', 'botnick') . "!stdin\@pbot"; $from = 'stdin@pbot';
$text = $self->{pbot}->{registry}->get_value('irc', 'botnick') . " $input"; $text = $self->{pbot}->{registry}->get_value('irc', 'botnick') . " $input";
} }
return $self->{pbot}->{interpreter}->process_line($from, $self->{pbot}->{registry}->get_value('irc', 'botnick'), "stdin", "pbot", $text); return $self->{pbot}->{interpreter}->process_line($from, $self->{pbot}->{registry}->get_value('irc', 'botnick'), "stdin", "pbot", $text);