aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillermo Ramos2019-06-25 14:45:23 +0200
committerGuillermo Ramos2019-06-25 14:50:41 +0200
commit5cd9d90a7fa86dc42b38d900b3ab4482f1f8ad59 (patch)
tree7ecc59d36cc43d669683ccf4900552eb96a1b2ae
parentd6f2506d29d78397944085e402421d01436d2a0a (diff)
downloadtgutils-5cd9d90a7fa86dc42b38d900b3ab4482f1f8ad59.tar.gz
Improve log messages
-rw-r--r--lib/TgLib/Api.pm8
-rwxr-xr-xtgsend2
-rwxr-xr-xtgserver2
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/TgLib/Api.pm b/lib/TgLib/Api.pm
index 3bbdde6..3056073 100644
--- a/lib/TgLib/Api.pm
+++ b/lib/TgLib/Api.pm
@@ -30,7 +30,11 @@ sub get_updates {
if ($resp->is_error()) {
die $resp->message;
} else {
- return decode_json($resp->content)->{'result'};
+ my $updates = decode_json($resp->content)->{'result'};
+ $logger->info(sprintf "Received %d updates from chats %s\n",
+ scalar(@$updates),
+ join(", ", map { $_->{'message'}{'chat'}{'id'} } @$updates));
+ return $updates;
}
}
@@ -42,7 +46,7 @@ sub send_message {
my $req = HTTP::Request->new("POST", $uri,
["Content-Type", "application/json"], $content);
- $logger->info("Sending to $chat_id:\n====\n$text\n====\n");
+ $logger->info("Sending to $chat_id: '$text'\n");
$logger->debug(sprintf "Request:\n%s\n", Dumper($req));
my $resp = $self->{'ua'}->request($req);
diff --git a/tgsend b/tgsend
index db6f412..9a77feb 100755
--- a/tgsend
+++ b/tgsend
@@ -44,7 +44,7 @@ my $text = <STDIN>;
# Send message to chats (or pretend to)
if ($PRETEND) {
- $logger->info("(prentend) Sending to $_:\n====\n$text\n====\n") foreach @ARGV;
+ $logger->info("(prentend) Sending to $_: '$text'\n") foreach @ARGV;
} else {
my $api = TgLib::Api->new($TOKEN, $logger);
$api->send_message($_, $text) foreach @ARGV;
diff --git a/tgserver b/tgserver
index 96e9b90..3dc3c9e 100755
--- a/tgserver
+++ b/tgserver
@@ -48,7 +48,7 @@ while (1) {
$logger->debug(sprintf "Update %s", Dumper($update));
my $text = $update->{'message'}{'text'};
my $chat_id = $update->{'message'}{'chat'}{'id'};
- $logger->info("Received update from chat $chat_id\n");
+ $logger->info("Received from chat $chat_id: '$text'\n");
use IPC::Open2 qw<open2>;
my $pid = open2(my $progr, my $progw, "@ARGV");