aleesa-bot/aleesa-telegram
0
Fork 0
Code Pull Requests Projects Releases Activity

Remove excessive debug, fix message format

Browse Source 
* Remove duplicate debug for outgoing redis message
* Add log category for outgoing debug redis message
* Add missing field in outgoing redis message
This commit is contained in:
eleksir
2022-04-24 01:00:06 +03:00
parent 060244a84d
commit 281a5e6b3c
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/BotLib.pm
View File

@@ -27,12 +27,13 @@ our @EXPORT_OK = qw (Command Highlight BotSleep IsCensored);
my $c = LoadConf (); my $c = LoadConf ();
my $csign = $c->{telegrambot}->{csign}; my $csign = $c->{telegrambot}->{csign};
my $redismsg->{from} = 'telegram'; my $redismsg->{from} = 'telegram';
$redismsg->{plugin} = 'telegram'; $redismsg->{plugin} = 'telegram';
$redismsg->{misc}->{answer} = 1; $redismsg->{misc}->{answer} = 1;
$redismsg->{misc}->{csign} = "$c->{telegrambot}->{csign}"; $redismsg->{misc}->{csign} = "$c->{telegrambot}->{csign}";
$redismsg->{misc}->{msg_format} = 0; $redismsg->{misc}->{msg_format} = 0;
$redismsg->{misc}->{fwd_cnt} = 1; $redismsg->{misc}->{fwd_cnt} = 1;
$redismsg->{misc}->{good_morning} = 0;
sub Command { sub Command {
my $self = shift; my $self = shift;
@@ -103,7 +104,6 @@ sub Command {
# Если команда найдена... # Если команда найдена...
if ($bingo) { if ($bingo) {
$rmsg->{message} = "$text"; $rmsg->{message} = "$text";
$self->log->debug ('[DEBUG] Sending message to redis ' . Dumper ($rmsg));
# Для некоторых команд мы хотим получать форматированный вывод # Для некоторых команд мы хотим получать форматированный вывод
$#cmds = -1; $#cmds = -1;
@@ -138,7 +138,7 @@ sub Command {
} while (sleep 1); } while (sleep 1);
} }
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg)); $log->debug ('[DEBUG] Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub; my $pubsub = $main::REDIS->pubsub;

22
lib/TelegramBot.pm
View File

@@ -41,12 +41,13 @@ my @introduce_greet = (
'Наше вам с кисточкой тут, на канальчике', 'Наше вам с кисточкой тут, на канальчике',
); );
my $redismsg->{from} = 'telegram'; my $redismsg->{from} = 'telegram';
$redismsg->{plugin} = 'telegram'; $redismsg->{plugin} = 'telegram';
$redismsg->{misc}->{answer} = 1; $redismsg->{misc}->{answer} = 1;
$redismsg->{misc}->{csign} = "$c->{telegrambot}->{csign}"; $redismsg->{misc}->{csign} = "$c->{telegrambot}->{csign}";
$redismsg->{misc}->{msg_format} = 0; $redismsg->{misc}->{msg_format} = 0;
$redismsg->{misc}->{fwd_cnt} = 1; $redismsg->{misc}->{fwd_cnt} = 1;
$redismsg->{misc}->{good_morning} = 0;
sub __cron { sub __cron {
my $self = shift; my $self = shift;
@@ -56,7 +57,6 @@ sub __cron {
# Press 'F' to pay respect # Press 'F' to pay respect
$rmsg->{message} = sprintf '%sf', $c->{telegrambot}->{csign}; $rmsg->{message} = sprintf '%sf', $c->{telegrambot}->{csign};
$rmsg->{misc}->{msg_format} = 1; $rmsg->{misc}->{msg_format} = 1;
$rmsg->{misc}->{answer} = 1;
$rmsg->{misc}->{good_morning} = 1; $rmsg->{misc}->{good_morning} = 1;
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime (time); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime (time);
@@ -80,7 +80,7 @@ sub __cron {
$rmsg->{userid} = "$enabledfortunechat"; $rmsg->{userid} = "$enabledfortunechat";
$rmsg->{chatid} = "$enabledfortunechat"; $rmsg->{chatid} = "$enabledfortunechat";
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg)); $log->debug ('[DEBUG] Outgoing redis message: ' . Dumper ($rmsg));
$pubsub->json ($c->{'redis_router_channel'})->notify ( $pubsub->json ($c->{'redis_router_channel'})->notify (
$c->{'redis_router_channel'} => $rmsg, $c->{'redis_router_channel'} => $rmsg,
@@ -271,7 +271,7 @@ sub __on_msg {
} while (sleep 1); } while (sleep 1);
} }
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg)); $log->debug ('[DEBUG] Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub; my $pubsub = $main::REDIS->pubsub;
@@ -367,7 +367,7 @@ sub __on_msg {
} while (sleep 1); } while (sleep 1);
} }
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg)); $log->debug ('[DEBUG] Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub; my $pubsub = $main::REDIS->pubsub;
@@ -425,7 +425,7 @@ sub __on_msg {
} while (sleep 1); } while (sleep 1);
} }
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg)); $log->debug ('[DEBUG] Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub; my $pubsub = $main::REDIS->pubsub;