Add SIGQUIT handler, fix setting of default value of loglevel

.perlcriticrc

@@ -14,8 +14,6 @@
 # Perl::Critic::Policy::ProhibitImplicitImport
 # Perl::Critic::Policy::CodeLayout::RequireUseUTF8
 
-severity    = 5
-verbose     = 8
 
 # minorify some of warnings that are not really critical
 [-InputOutput::RequireCheckedClose]
@@ -131,3 +129,5 @@ lib_sections    = NAME | VERSION | DESCRIPTION | AUTHOR | LICENSE AND COPYRIGHT
 max_length = 256
 
 [-Miscellanea::ProhibitUnrestrictedNoCritic]
+
+[-RegularExpressions::ProhibitFixedStringMatches]

bin/aleesa-craniac

@@ -47,7 +47,10 @@ my $runAsUid = $UID;
 
 my $piddir = '/var/run/' . basename (abs_path ($PROGRAM_NAME));
 my $C = LoadConf ();
-my $loglevel = $C->{'loglevel'} // 'notice';
+
+my $loglevel = 'notice';
+$loglevel = $C->{'loglevel'} if defined $C->{'loglevel'};
+
 my $logfile;
 
 if (defined $C->{'log'}) {
@@ -136,6 +139,7 @@ close $MYPID;                                        ## no critic (InputOutput::
 # подстраховка на случай ядерной войны.
 local $SIG{INT}  = \&__signal_handler;
 local $SIG{TERM} = \&__signal_handler;
+local $SIG{QUIT} = \&__signal_handler;
 
 # Поставим правильное имя процесса в proctitle
 $PROGRAM_NAME = abs_path $PROGRAM_NAME;              ## no critic (Variables::RequireLocalizedPunctuationVars)
@@ -152,7 +156,7 @@ exit 0;
 sub daemonize {
 	__fork ();
 	setsid ();
-	open STDIN, '<', File::Spec->devnull;                    ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
+	open STDIN, '<', File::Spec->devnull;            ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::RequireCheckedOpen)
 	__fork ();
 	umask 0;
 	return;

lib/Craniac.pm

@@ -42,7 +42,11 @@ sub brains (@);
 sub RunCraniac ();
 
 my $c = LoadConf ();
-my $fwd_cnt = $c->{'forward_max'} // 5;
+my $fwd_cnt = 5;
+
+if (defined $c->{'forward_max'}) {
+	$fwd_cnt = $c->{'forward_max'};
+}
 
 my $hailo;
 
@@ -128,49 +132,49 @@ my $parse_message = sub {
 	my $reply;
 
 	if (defined $answer->{misc}) {
-			unless (defined $answer->{misc}->{answer}) {
+		unless (defined $answer->{misc}->{answer}) {
-					$answer->{misc}->{answer} = 1;
-			}
-
-			unless (defined $answer->{misc}->{bot_nick}) {
-					$answer->{misc}->{bot_nick} = '';
-			}
-
-			unless (defined $answer->{misc}->{csign}) {
-					$answer->{misc}->{csign} = $c->{csign};
-			}
-
-			unless (defined $answer->{misc}->{fwd_cnt}) {
-					$answer->{misc}->{fwd_cnt} = 1;
-			} else {
-					if ($answer->{misc}->{fwd_cnt} > $fwd_cnt) {
-							$log->error ('[ERROR] Forward loop detected, discarding message.');
-							$log->debug (Dumper $m);
-							return;
-					} else {
-							$answer->{misc}->{fwd_cnt}++;
-					}
-			}
-
-			unless (defined $answer->{misc}->{good_morning}) {
-					$answer->{misc}->{good_morning} = 0;
-			}
-
-			unless (defined $answer->{misc}->{msg_format}) {
-					$answer->{misc}->{msg_format} = 0;
-			}
-
-			unless (defined $answer->{misc}->{username}) {
-					$answer->{misc}->{username} = 'user';
-			}
-	} else {
 			$answer->{misc}->{answer} = 1;
+		}
+
+		unless (defined $answer->{misc}->{bot_nick}) {
 			$answer->{misc}->{bot_nick} = '';
+		}
+
+		unless (defined $answer->{misc}->{csign}) {
 			$answer->{misc}->{csign} = $c->{csign};
+		}
+
+		unless (defined $answer->{misc}->{fwd_cnt}) {
 			$answer->{misc}->{fwd_cnt} = 1;
+		} else {
+			if ($answer->{misc}->{fwd_cnt} > $fwd_cnt) {
+				$log->error ('[ERROR] Forward loop detected, discarding message.');
+				$log->debug (Dumper $m);
+				return;
+			} else {
+				$answer->{misc}->{fwd_cnt}++;
+			}
+		}
+
+		unless (defined $answer->{misc}->{good_morning}) {
 			$answer->{misc}->{good_morning} = 0;
+		}
+
+		unless (defined $answer->{misc}->{msg_format}) {
 			$answer->{misc}->{msg_format} = 0;
+		}
+
+		unless (defined $answer->{misc}->{username}) {
 			$answer->{misc}->{username} = 'user';
+		}
+	} else {
+		$answer->{misc}->{answer} = 1;
+		$answer->{misc}->{bot_nick} = '';
+		$answer->{misc}->{csign} = $c->{csign};
+		$answer->{misc}->{fwd_cnt} = 1;
+		$answer->{misc}->{good_morning} = 0;
+		$answer->{misc}->{msg_format} = 0;
+		$answer->{misc}->{username} = 'user';
 	}
 
 	my $csign = $answer->{misc}->{csign};
@@ -339,7 +343,7 @@ my $parse_message = sub {
 			}
 		}
 
-		# Попадаем сюда только если входящая фраза не распознана ранее как ключевая. 
+		# Попадаем сюда только если входящая фраза не распознана ранее как ключевая.
 		my $cid;
 
 		if ($m->{plugin} eq 'telegram') {
@@ -446,6 +450,7 @@ sub RunCraniac () {
 
 	Mojo::IOLoop::Signal->on (TERM => $__signal_handler);
 	Mojo::IOLoop::Signal->on (INT  => $__signal_handler);
+	Mojo::IOLoop::Signal->on (QUIT => $__signal_handler);
 
 	do { Mojo::IOLoop->start } until Mojo::IOLoop->is_running;
 	return;