Perlcritic overhaul, add missing 'use module', update cpanfile, replace Mojo::Log with Log::Any
* Use more strict policy in perlcritic (add more policies) * Add missing Use Encode and Use File::Spec in Craniac.pm * Replace Mojo::Log with Log::Any, as Log::Any can catch stacktraces * Update cpanfile
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
use 5.018;
|
||||
use 5.018; ## no critic (ProhibitImplicitImport)
|
||||
use strict;
|
||||
use warnings;
|
||||
use utf8;
|
||||
@@ -29,7 +29,10 @@ no Cwd;
|
||||
use Cwd::utf8 qw (chdir abs_path);
|
||||
use File::Basename qw (basename dirname);
|
||||
use File::Path qw (make_path);
|
||||
use Mojo::Log;
|
||||
use File::Spec ();
|
||||
use Log::Any qw ($log);
|
||||
use Log::Any::Adapter ();
|
||||
use Log::Any::For::Std ();
|
||||
use POSIX qw (setgid setuid setsid);
|
||||
|
||||
use Conf qw (LoadConf);
|
||||
@@ -44,9 +47,8 @@ my $runAsUid = $UID;
|
||||
|
||||
my $piddir = '/var/run/' . basename (abs_path ($PROGRAM_NAME));
|
||||
my $C = LoadConf ();
|
||||
my $loglevel = $C->{'loglevel'} // 'info';
|
||||
my $loglevel = $C->{'loglevel'} // 'notice';
|
||||
my $logfile;
|
||||
my $log;
|
||||
|
||||
if (defined $C->{'log'}) {
|
||||
$logfile = $C->{'log'};
|
||||
@@ -69,8 +71,8 @@ if ($UID == 0) {
|
||||
make_path (
|
||||
$piddir, {
|
||||
uid => $uid,
|
||||
group => $gid
|
||||
}
|
||||
group => $gid,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@@ -81,8 +83,8 @@ if ($UID == 0) {
|
||||
make_path (
|
||||
$logdir, {
|
||||
uid => $uid,
|
||||
group => $gid
|
||||
}
|
||||
group => $gid,
|
||||
},
|
||||
) or die "Unable to create $logdir: $OS_ERROR\n";
|
||||
}
|
||||
}
|
||||
@@ -95,9 +97,9 @@ if ($UID == 0) {
|
||||
}
|
||||
|
||||
if (defined $logfile) {
|
||||
$log = Mojo::Log->new (path => $logfile, level => $loglevel);
|
||||
Log::Any::Adapter->set ('File', $logfile, log_level => $loglevel);
|
||||
} else {
|
||||
$log = Mojo::Log->new (path => '/dev/null', level => 'fatal');
|
||||
Log::Any::Adapter->set ('File', File::Spec->devnull);
|
||||
}
|
||||
|
||||
# По-умолчанию, демонизируемся, если явно не указано, что этого делать не надо
|
||||
@@ -113,7 +115,7 @@ my $apath = abs_path $PROGRAM_NAME;
|
||||
unless (defined $apath) {
|
||||
$log->fatal ("[FATAL] Unable to get abs_path: $OS_ERROR\n");
|
||||
exit 1;
|
||||
};
|
||||
}
|
||||
|
||||
my $pidfile = sprintf '%s/%s.pid', $piddir, basename $apath;
|
||||
$log->info ("[INFO] Creating pidfile at $pidfile");
|
||||
@@ -141,7 +143,7 @@ $PROGRAM_NAME = abs_path $PROGRAM_NAME; ## no critic (Variables::Re
|
||||
# И запустим уже наш сервис
|
||||
RunCraniac ();
|
||||
|
||||
if (-f $pidfile) {
|
||||
if (-e $pidfile) {
|
||||
unlink $pidfile;
|
||||
}
|
||||
|
||||
@@ -149,8 +151,8 @@ exit 0;
|
||||
|
||||
sub daemonize {
|
||||
__fork ();
|
||||
POSIX::setsid ();
|
||||
open STDIN, '<', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
|
||||
setsid ();
|
||||
open STDIN, '<', File::Spec->devnull; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
|
||||
__fork ();
|
||||
umask 0;
|
||||
return;
|
||||
@@ -174,7 +176,7 @@ sub __fork {
|
||||
sub __signal_handler {
|
||||
$log->info ("[INFO] Caught a signal $OS_ERROR");
|
||||
|
||||
if (-f $pidfile) {
|
||||
if (-e $pidfile) {
|
||||
unlink $pidfile;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/perl
|
||||
# Наполняет отдельный "мозг" с бредом латинскими выражениями
|
||||
|
||||
use 5.018;
|
||||
use 5.018; ## no critic (ProhibitImplicitImport)
|
||||
use strict;
|
||||
use warnings;
|
||||
use utf8;
|
||||
|
||||
Reference in New Issue
Block a user