sydney/Autobot
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Elijah Perrault committed 2011-02-07 14:06:54 -07:00
1 parent 62ed5af6e0
commit bdaadb4f87
1 file changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files
bin/auto
+13 -10
View File
@@ -16,12 +16,12 @@ use IO::Socket;
use IO::Select; use IO::Select;
use Class::Unload; use Class::Unload;
use FindBin qw($Bin); use FindBin qw($Bin);
our $Bin = $Bin; our $Bin = $Bin; ## no critic qw(NamingConventions::Capitalization Variables::ProhibitPackageVars)
BEGIN { BEGIN {
unshift @INC, "$Bin/../src"; unshift @INC, "$Bin/../src";
# Set version information. # Set version information.
use constant { use constant { ## no critic qw(ValuesAndExpressions::ProhibitConstantPragma)
NAME => 'Auto IRC Bot', NAME => 'Auto IRC Bot',
VER => 3, VER => 3,
SVER => 0, SVER => 0,
@@ -304,7 +304,7 @@ foreach my $cskey (keys %cservers) {
); );
# Set IPv6 data. # Set IPv6 data.
my $use6 = 0; my $use6 = 0;
$use6 = $SOCKET{$cskey}{'ipv6'} if defined $SOCKET{$cskey}{'ipv6'}[0]; if (defined $SOCKET{$cskey}{'ipv6'}[0]) { $use6 = $SOCKET{$cskey}{'ipv6'}[0]; }
# Create the socket. # Create the socket.
if ($use6) { if ($use6) {
@@ -381,7 +381,7 @@ while (1) {
# Figure out what network is sending us data. # Figure out what network is sending us data.
my $sockid; my $sockid;
foreach (keys %SOCKET) { foreach (keys %SOCKET) {
$sockid = $_ if ($SOCKET{$_} eq $sock); if ($SOCKET{$_} eq $sock) { $sockid = $_; }
} }
# Read the data. # Read the data.
my $idata; my $idata;
@@ -448,7 +448,7 @@ sub mod_load {
sub signal_term sub signal_term
{ {
API::Std::event_run('on_sigterm'); API::Std::event_run('on_sigterm');
API::IRC::quit($_, 'Caught SIGTERM') foreach (keys %SOCKET); foreach (keys %SOCKET) { API::IRC::quit($_, 'Caught SIGTERM'); }
DB::flush(); DB::flush();
dbug '!!! Caught SIGTERM; terminating...'; dbug '!!! Caught SIGTERM; terminating...';
alog '!!! Caught SIGTERM; terminating...'; alog '!!! Caught SIGTERM; terminating...';
@@ -463,7 +463,7 @@ sub signal_term
sub signal_int sub signal_int
{ {
API::Std::event_run('on_sigint'); API::Std::event_run('on_sigint');
API::IRC::quit($_, 'Caught SIGINT') foreach (keys %SOCKET); foreach (keys %SOCKET) { API::IRC::quit($_, 'Caught SIGINT'); }
DB::flush(); DB::flush();
dbug '!!! Caught SIGINT; terminating...'; dbug '!!! Caught SIGINT; terminating...';
alog '!!! Caught SIGINT; terminating...'; alog '!!! Caught SIGINT; terminating...';
@@ -489,21 +489,24 @@ sub signal_perlwarn
my ($warnmsg) = @_; my ($warnmsg) = @_;
$warnmsg =~ s/(\n|\r)//xsmg; $warnmsg =~ s/(\n|\r)//xsmg;
alog 'Perl Warning: '.$warnmsg; alog 'Perl Warning: '.$warnmsg;
println 'Perl Warning: '.$warnmsg if $DEBUG; if ($DEBUG) { println 'Perl Warning: '.$warnmsg; }
return 1; return 1;
} }
# __DIE__ # __DIE__
sub signal_perldie sub signal_perldie
{ {
my ($diemsg) = @_;
$diemsg =~ s/(\n|\r)//xsmg;
return if $EXCEPTIONS_BEING_CAUGHT; return if $EXCEPTIONS_BEING_CAUGHT;
alog 'Perl Fatal: '.$_[0].' -- Terminating program!'; alog 'Perl Fatal: '.$diemsg.' -- Terminating program!';
API::IRC::quit($_, 'A fatal error occurred!') foreach (keys %SOCKET); foreach (keys %SOCKET) { API::IRC::quit($_, 'A fatal error occurred!'); }
DB::flush(); DB::flush();
if (-e "$Bin/auto.pid") { if (-e "$Bin/auto.pid") {
unlink "$Bin/auto.pid"; unlink "$Bin/auto.pid";
} }
sleep 1; sleep 1;
println 'FATAL: '.$_[0]; println 'FATAL: '.$diemsg;
exit; exit;
} }