aleesa-bot/aleesa-misc
Archived
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Perlcritic overhaul, update cpanfile

Browse Source
This commit is contained in:
eleksir
2022-02-12 23:04:52 +03:00
parent 278db1e9ca
commit 674efac431
5 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.perlcriticrc
View File

@@ -95,3 +95,19 @@ lib_sections = NAME | VERSION | DESCRIPTION | AUTHOR | LICENSE AND COPYRIGHT
[-Variables::ProhibitPackageVars] [-Variables::ProhibitPackageVars]
# fuck off # fuck off
[-Editor::RequireEmacsFileVariables]
[-TooMuchCode::ProhibitUnnecessaryUTF8Pragma]
[-CodeLayout::RequireASCII]
[-TooMuchCode::ProhibitDuplicateLiteral]
[-ErrorHandling::RequireUseOfExceptions]
[-ValuesAndExpressions::RequireConstantOnLeftSideOfEquality]
[-Lax::RequireConstantOnLeftSideOfEquality::ExceptEq]
[-Miscellanea::ProhibitUnrestrictedNoCritic]

27
bin/aleesa-misc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
use 5.018; use 5.018; ## no critic (ProhibitImplicitImport)
use strict; use strict;
use warnings; use warnings;
use utf8; use utf8;
@@ -29,9 +29,10 @@ 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 File::Spec ();
use Log::Any qw ($log); use Log::Any qw ($log);
use Log::Any::Adapter; use Log::Any::Adapter ();
use Log::Any::For::Std; 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 Misc qw (RunMisc); use Misc qw (RunMisc);
@@ -69,8 +70,8 @@ if ($UID == 0) {
make_path ( make_path (
$piddir, { $piddir, {
uid => $uid, uid => $uid,
group => $gid group => $gid,
} },
); );
} }
@@ -81,8 +82,8 @@ if ($UID == 0) {
make_path ( make_path (
$logdir, { $logdir, {
uid => $uid, uid => $uid,
group => $gid group => $gid,
} },
) or die "Unable to create $logdir: $OS_ERROR\n"; ) or die "Unable to create $logdir: $OS_ERROR\n";
} }
} }
@@ -97,7 +98,7 @@ if ($UID == 0) {
if (defined $logfile) { if (defined $logfile) {
Log::Any::Adapter->set ('File', $logfile, log_level => $loglevel); Log::Any::Adapter->set ('File', $logfile, log_level => $loglevel);
} else { } else {
Log::Any::Adapter->set ('File', '/dev/null'); Log::Any::Adapter->set ('File', File::Spec->devnull);
} }
# По-умолчанию, демонизируемся, если явно не указано, что этого делать не надо # По-умолчанию, демонизируемся, если явно не указано, что этого делать не надо
@@ -113,7 +114,7 @@ my $apath = abs_path $PROGRAM_NAME;
unless (defined $apath) { unless (defined $apath) {
$log->fatal ("[FATAL] Unable to get abs_path: $OS_ERROR\n"); $log->fatal ("[FATAL] Unable to get abs_path: $OS_ERROR\n");
exit 1; exit 1;
}; }
our $pidfile = sprintf '%s/%s.pid', $piddir, basename $apath; our $pidfile = sprintf '%s/%s.pid', $piddir, basename $apath;
$log->info ("[INFO] Creating pidfile at $pidfile"); $log->info ("[INFO] Creating pidfile at $pidfile");
@@ -141,7 +142,7 @@ $PROGRAM_NAME = abs_path $PROGRAM_NAME; ## no critic (Variables::Re
# И запустим уже наш сервис # И запустим уже наш сервис
RunMisc (); RunMisc ();
if (-f $pidfile) { if (-e $pidfile) {
unlink $pidfile; unlink $pidfile;
} }
@@ -149,8 +150,8 @@ exit 0;
sub daemonize { sub daemonize {
__fork (); __fork ();
POSIX::setsid (); setsid ();
open STDIN, '<', '/dev/null'; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen) open STDIN, '<', File::Spec->devnull; ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
__fork (); __fork ();
umask 0; umask 0;
return; return;
@@ -174,7 +175,7 @@ sub __fork {
sub __signal_handler { sub __signal_handler {
$log->info ("[INFO] Caught a signal $OS_ERROR"); $log->info ("[INFO] Caught a signal $OS_ERROR");
if (-f $pidfile) { if (-e $pidfile) {
unlink $pidfile; unlink $pidfile;
} }

8
cpanfile
View File

@@ -1,3 +1,4 @@
## no critic
requires 'Carp', '==1.50'; requires 'Carp', '==1.50';
requires 'Clone', '==0.45'; requires 'Clone', '==0.45';
requires 'Cwd', '==3.75'; requires 'Cwd', '==3.75';
@@ -7,8 +8,9 @@ requires 'Encode', '==3.16';
requires 'English', '==1.11'; requires 'English', '==1.11';
requires 'EV', '==4.33'; requires 'EV', '==4.33';
requires 'Exporter', '==5.74'; requires 'Exporter', '==5.74';
requires 'File::Basename', '0'; requires 'File::Basename', '==2.85';
requires 'File::Path', '==2.18'; requires 'File::Path', '==2.18';
requires 'File::Spec', '==3.75';
requires 'IO::Socket::SSL', '==2.072'; requires 'IO::Socket::SSL', '==2.072';
requires 'JSON', '==4.03'; requires 'JSON', '==4.03';
requires 'JSON::XS', '==4.03'; requires 'JSON::XS', '==4.03';
@@ -20,8 +22,8 @@ requires 'Math::Random::Secure', '==0.080001';
requires 'Mojolicious', '==9.22'; requires 'Mojolicious', '==9.22';
requires 'Mojo::Redis', '==3.27'; requires 'Mojo::Redis', '==3.27';
requires 'Mojo::IOLoop::Signal', '==0.003'; requires 'Mojo::IOLoop::Signal', '==0.003';
requires 'open', '0'; requires 'open', '==1.12';
requires 'POSIX', '0'; requires 'POSIX', '0';
requires 'Protocol::Redis::XS', '0'; requires 'Protocol::Redis::XS', '0';
requires 'utf8', '0'; requires 'utf8', '0';
requires 'version', '0'; requires 'version', '==0.9929';

22
lib/Conf.pm
View File

@@ -1,14 +1,13 @@
package Conf; package Conf;
# loads config # Загружает конфиг файл
use 5.018; use 5.018; ## no critic (ProhibitImplicitImport)
use strict; use strict;
use warnings; use warnings;
use utf8; use utf8;
use open qw (:std :utf8); use open qw (:std :utf8);
use English qw ( -no_match_vars ); use English qw ( -no_match_vars );
use Encode qw (encode); use JSON::XS ();
use JSON::XS;
use version; our $VERSION = qw (1.0); use version; our $VERSION = qw (1.0);
use Exporter qw (import); use Exporter qw (import);
@@ -16,17 +15,26 @@ our @EXPORT_OK = qw (LoadConf);
sub LoadConf { sub LoadConf {
my $c = 'data/config.json'; my $c = 'data/config.json';
open my $CH, '<', $c or die "[FATAL] No conf at $c: $OS_ERROR\n"; my $CH;
my $json;
unless (open $CH, '<', $c) {
die "[FATAL] No conf at $c: $OS_ERROR\n";
}
my $len = (stat $c) [7]; my $len = (stat $c) [7];
my $json;
my $readlen = read $CH, $json, $len; my $readlen = read $CH, $json, $len;
$json = encode 'UTF-8', $json;
unless ($readlen) { unless ($readlen) {
close $CH; ## no critic (InputOutput::RequireCheckedSyscalls close $CH; ## no critic (InputOutput::RequireCheckedSyscalls
die "[FATAL] Unable to read $c: $OS_ERROR\n"; die "[FATAL] Unable to read $c: $OS_ERROR\n";
} }
if ($readlen != $len) {
close $CH; ## no critic (InputOutput::RequireCheckedSyscalls
die "[FATAL] File $c is $len bytes on disk, but we read only $readlen bytes\n";
}
close $CH; ## no critic (InputOutput::RequireCheckedSyscalls close $CH; ## no critic (InputOutput::RequireCheckedSyscalls
my $j = JSON::XS->new->utf8->relaxed; my $j = JSON::XS->new->utf8->relaxed;
return $j->decode ($json); return $j->decode ($json);

27
lib/Misc.pm
View File

@@ -1,7 +1,7 @@
package Misc; package Misc;
# Общие модули - синтаксис, кодировки итд # Общие модули - синтаксис, кодировки итд
use 5.018; use 5.018; ## no critic (ProhibitImplicitImport)
use strict; use strict;
use warnings; use warnings;
use utf8; use utf8;
@@ -10,13 +10,12 @@ use open qw (:std :utf8);
use Clone qw (clone); use Clone qw (clone);
# Модули для работы приложения # Модули для работы приложения
use Log::Any qw ($log); use Log::Any qw ($log);
use Math::Random::Secure qw (irand);
# Чтобы "уж точно" использовать hiredis-биндинги, загрузим этот модуль перед Mojo::Redis # Чтобы "уж точно" использовать hiredis-биндинги, загрузим этот модуль перед Mojo::Redis
use Protocol::Redis::XS; use Protocol::Redis::XS ();
use Mojo::Redis; use Mojo::Redis ();
use Mojo::IOLoop; use Mojo::IOLoop ();
use Mojo::IOLoop::Signal; use Mojo::IOLoop::Signal ();
use Data::Dumper; use Data::Dumper qw (Dumper);
use Conf qw (LoadConf); use Conf qw (LoadConf);
@@ -136,7 +135,7 @@ my $parse_message = sub {
$log->debug ("[DEBUG] Sending message to channel $send_to " . Dumper ($answer)); $log->debug ("[DEBUG] Sending message to channel $send_to " . Dumper ($answer));
$self->json ($send_to)->notify ( $self->json ($send_to)->notify (
$send_to => $answer $send_to => $answer,
); );
return; return;
@@ -146,7 +145,7 @@ my $__signal_handler = sub {
my ($self, $name) = @_; my ($self, $name) = @_;
$log->info ("[INFO] Caught a signal $name"); $log->info ("[INFO] Caught a signal $name");
if (defined $main::pidfile && -f $main::pidfile) { if (defined $main::pidfile && -e $main::pidfile) {
unlink $main::pidfile; unlink $main::pidfile;
} }
@@ -159,7 +158,7 @@ sub RunMisc {
$log->info ("[INFO] 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->info ('[INFO] Registering connection-event callback'); $log->info ('[INFO] Registering connection-event callback');
@@ -176,11 +175,11 @@ sub RunMisc {
my ($conn, $error) = @_; my ($conn, $error) = @_;
$log->error ("[ERROR] Redis connection error: $error"); $log->error ("[ERROR] Redis connection error: $error");
return; return;
} },
); );
return; return;
} },
); );
my $pubsub = $redis->pubsub; my $pubsub = $redis->pubsub;
@@ -191,13 +190,13 @@ sub RunMisc {
$log->debug ("[DEBUG] 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->(@_); },
); );
} }
Mojo::IOLoop::Signal->on ( Mojo::IOLoop::Signal->on (
TERM => $__signal_handler, TERM => $__signal_handler,
INT => $__signal_handler INT => $__signal_handler,
); );
do { Mojo::IOLoop->start } until Mojo::IOLoop->is_running; do { Mojo::IOLoop->start } until Mojo::IOLoop->is_running;