Use logging facility from mojo

This commit is contained in:
eleksir
2021-12-28 02:11:34 +03:00
parent 1c82a2ec0e
commit 352dc3b54c
4 changed files with 32 additions and 32 deletions

View File

@@ -29,9 +29,7 @@ no Cwd;
use Cwd::utf8 qw (chdir abs_path); use Cwd::utf8 qw (chdir abs_path);
use File::Basename qw (basename dirname); use File::Basename qw (basename dirname);
use File::Path qw (make_path); use File::Path qw (make_path);
use Log::Any qw ($log); use Mojo::Log;
use Log::Any::Adapter;
use Log::Any::For::Std;
use POSIX qw (setgid setuid setsid); use POSIX qw (setgid setuid setsid);
use Conf qw (LoadConf); use Conf qw (LoadConf);
use Craniac qw (RunCraniac); use Craniac qw (RunCraniac);
@@ -47,6 +45,7 @@ my $piddir = '/var/run/' . basename (abs_path ($PROGRAM_NAME));
my $C = LoadConf (); my $C = LoadConf ();
my $loglevel = $C->{'loglevel'} // 'notice'; my $loglevel = $C->{'loglevel'} // 'notice';
my $logfile; my $logfile;
my $log;
if (defined $C->{'log'}) { if (defined $C->{'log'}) {
$logfile = $C->{'log'}; $logfile = $C->{'log'};
@@ -94,21 +93,9 @@ if ($UID == 0) {
} }
if (defined $logfile) { if (defined $logfile) {
Log::Any::Adapter->set ('File', $logfile, log_level => $loglevel); $log = Mojo::Log->new (path => $logfile, level => $loglevel);
# Some annoying CHI logging events come with category set to CHI::Driver and log_level set to debug.
# Until we use start using Log::Any native features and set whole loglevel accordingly, lets lower
# verbosity paticulary for CHI.
Log::Any::Adapter->set (
{
category => 'CHI::Driver'
},
'File',
$logfile,
log_level => 'warn'
);
} else { } else {
Log::Any::Adapter->set ('File', '/dev/null'); $log = Mojo::Log->new (path => '/dev/null', level => 'fatal');
} }
# по-умолчанию, демонизируемся, если явно не указано, что этого делать не надо # по-умолчанию, демонизируемся, если явно не указано, что этого делать не надо
@@ -160,7 +147,6 @@ sub daemonize {
__fork (); __fork ();
POSIX::setsid (); POSIX::setsid ();
open STDIN, '<', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen) open STDIN, '<', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
# we handle STDOUT && STDERR via Log::Any::For::Std, so do not close them explicitly
#open STDOUT, '>', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen) #open STDOUT, '>', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
#open STDERR, '>', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen) #open STDERR, '>', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
__fork (); __fork ();

View File

@@ -8,11 +8,9 @@ requires 'File::Path';
requires 'Hailo'; requires 'Hailo';
requires 'JSON::XS'; requires 'JSON::XS';
requires 'local::lib'; requires 'local::lib';
requires 'Log::Any';
requires 'Log::Any::Adapter';
requires 'Log::Any::For::Std';
requires 'Math::Random::Secure'; requires 'Math::Random::Secure';
requires 'Mojo::IOLoop'; requires 'Mojo::IOLoop';
requires 'Mojo::Log';
requires 'Mojo::Redis'; requires 'Mojo::Redis';
requires 'POSIX'; requires 'POSIX';
requires 'Protocol::Redis::XS'; requires 'Protocol::Redis::XS';

View File

@@ -19,7 +19,7 @@
# logs goes there # logs goes there
"log" : "/var/log/aleesa-craniac/aleesa-craniac.log", "log" : "/var/log/aleesa-craniac/aleesa-craniac.log",
"loglevel": "notice", "loglevel": "info",
# ditto # ditto
"pid" : "/var/run/aleesa-craniac/aleesa-craniac.pid" "pid" : "/var/run/aleesa-craniac/aleesa-craniac.pid"

View File

@@ -19,11 +19,11 @@ use English qw ( -no_match_vars );
# Модули для работы приложения # Модули для работы приложения
use Digest::SHA qw (sha1_base64); use Digest::SHA qw (sha1_base64);
use Hailo; use Hailo;
use Log::Any qw ($log); use Mojo::IOLoop;
use Mojo::Log;
# Чтобы "уж точно" использовать hiredis-биндинги, загрузим этот модуль перед Mojo::Redis # Чтобы "уж точно" использовать hiredis-биндинги, загрузим этот модуль перед Mojo::Redis
use Protocol::Redis::XS; use Protocol::Redis::XS;
use Mojo::Redis; use Mojo::Redis;
use Mojo::IOLoop;
use Math::Random::Secure qw (irand); use Math::Random::Secure qw (irand);
use Text::Fuzzy qw (distance_edits); use Text::Fuzzy qw (distance_edits);
@@ -39,6 +39,22 @@ sub brains (@);
sub RunCraniac (); sub RunCraniac ();
my $c = LoadConf (); my $c = LoadConf ();
my $loglevel = $c->{'loglevel'} // 'info';
my $logfile;
my $log;
if (defined $c->{'log'}) {
$logfile = $c->{'log'};
} elsif (defined $c->{'debug_log'}) {
$logfile = $c->{'debug_log'};
}
if (defined $logfile) {
$log = Mojo::Log->new (path => $logfile, level => $loglevel);
} else {
$log = Mojo::Log->new (path => '/dev/null', level => 'fatal');
}
my $hailo; my $hailo;
sub RandomCommonPhrase () { sub RandomCommonPhrase () {
@@ -241,13 +257,13 @@ my $parse_message = sub {
# Main loop, он же event loop # Main loop, он же event loop
sub RunCraniac () { sub RunCraniac () {
$log->notice ("[NOTICE] Connecting to $c->{server}, $c->{port}"); $log->info ("[INFO] Connecting to $c->{server}, $c->{port}");
my $redis = Mojo::Redis->new ( my $redis = Mojo::Redis->new (
sprintf 'redis://%s:%s/1', $c->{server}, $c->{port} sprintf 'redis://%s:%s/1', $c->{server}, $c->{port}
); );
$log->notice ('[NOTICE] Registering connection-event callback'); $log->info ('[INFO] Registering connection-event callback');
$redis->on ( $redis->on (
connection => sub { connection => sub {
@@ -270,10 +286,10 @@ sub RunCraniac () {
my $pubsub = $redis->pubsub; my $pubsub = $redis->pubsub;
my $sub; my $sub;
$log->notice ('[NOTICE] Subscribing to redis channels'); $log->info ('[INFO] Subscribing to redis channels');
foreach my $channel (@{$c->{channels}}) { foreach my $channel (@{$c->{channels}}) {
$log->info ("[INFO] Subscribing to $channel"); $log->debug ("[DEBUG] Subscribing to $channel");
$sub->{$channel} = $pubsub->json ($channel)->listen ( $sub->{$channel} = $pubsub->json ($channel)->listen (
$channel => sub { $parse_message->(@_); } $channel => sub { $parse_message->(@_); }