X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=bin%2FannounceEmail.pl;h=d21003bc64d709a7f39433ff8fe479083817d1a2;hb=2db463a09a9f519492322d5e82f0c283b40bfef8;hp=7a76fc408ab3804c639ed33806469d7df85a8948;hpb=b19aff368e8114dd44bbd7e306b0946f060e3051;p=clearscm.git diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl index 7a76fc4..d21003b 100755 --- a/bin/announceEmail.pl +++ b/bin/announceEmail.pl @@ -31,23 +31,32 @@ $Date: 2019/04/04 13:40:10 $ =head1 SYNOPSIS - Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug] [-da|emon] + Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug] [-use|rname ] [-p|assword ] - [-i|map ] + [-an|nouce] [-ap|pend] [-da|emon] [-n|name ] + [-uses|sl] [-useb|locking] Where: - -usa|ge: Print this usage - -h|elp: Detailed help - -v|erbose: Verbose mode (Default: -verbose) - -de|bug: Turn on debugging (Default: Off) - -da|emon: Run in daemon mode (Default: -daemon) - -user|name: User name to log in with (Default: $USER) - -p|assword: Password to use (Default: prompted) - -n|ame: Name of account (Default: imap) - -i|map: IMAP server to talk to (Default: defaria.com) - -uses|sl: Whether or not to use SSL to connect (Default: False) + -usa|ge Print this usage + -h|elp Detailed help + -v|erbose Verbose mode (Default: -verbose) + -de|bug Turn on debugging (Default: Off) + + -user|name User name to log in with (Default: $USER) + -p|assword Password to use (Default: prompted) + -i|map IMAP server to talk to (Default: defaria.com) + + -an|nounce Announce startup (Default: False) + -ap|pend Append to logfile (Default: Noappend) + -da|emon Run in daemon mode (Default: -daemon) + -n|ame Name of account (Default: imap) + -uses|sl Whether or not to use SSL to connect (Default: False) -useb|locking Whether to block on socket (Default: False) - -a-nnounce Announce startup (Default: False) + + Signals: + $SIG{USR1}: Toggles debug option + $SIG{USR2}: Reestablishes connection to IMAP server =head1 DESCRIPTION @@ -73,8 +82,9 @@ use lib "$FindBin::Bin/../lib"; use Display; use Logger; -use Utils; +use Speak; use TimeUtils; +use Utils; my $defaultIMAPServer = 'defaria.com'; my $IMAP; @@ -92,6 +102,7 @@ my @greetings = ( 'I was looking in your inbox and found a message', 'Not sure you want to hear this message', 'Good news', + "What's this? A new message", ); my %opts = ( @@ -103,9 +114,6 @@ my %opts = ( username => $ENV{USER}, password => $ENV{PASSWORD}, imap => $defaultIMAPServer, - usessl => 0, - useblocking => 0, - announce => 0, ); sub interrupted { @@ -120,7 +128,17 @@ sub interrupted { return; } # interrupted +sub Connect2IMAP; + +sub restart { + $log->dbug("Re-establishing connection to $opts{imap} as $opts{username}"); + Connect2IMAP; + + goto MONITORMAIL; +} # restart + $SIG{USR1} = \&interrupted; +$SIG{USR2} = \&restart; sub unseenMsgs() { $IMAP->select('inbox') or @@ -132,6 +150,9 @@ sub unseenMsgs() { sub Connect2IMAP() { $log->dbug("Connecting to $opts{imap} as $opts{username}"); + # Destroy any old connections + undef $IMAP; + $IMAP = Mail::IMAPTalk->new( Server => $opts{imap}, Username => $opts{username}, @@ -152,37 +173,23 @@ sub Connect2IMAP() { return; } # Connect2IMAP -sub Say($) { - my ($msg) = @_; - - if (-f "$FindBin::Bin/shh") { - $log->msg("Not speaking because we were asked to be quiet - $msg"); - - return; - } # if - - my ($status, @output) = Execute "/usr/local/bin/gt \"$msg\""; - - $log->err("Unable to speak (Status: $status) - " - . join ("\n", @output), $status) if $status; - - return; -} # Say - sub MonitorMail() { MONITORMAIL: + $log->dbug("Top of MonitorMail loop"); # First close and reselect the INBOX to get its current status $IMAP->close; $IMAP->select('INBOX') or $log->err("Unable to select INBOX - ". $IMAP->errstr(), 1); + $log->dbug("Closed and reselected INBOX"); # Go through all of the unseen messages and add them to %unseen if they were # not there already from a prior run and read my %newUnseen = unseenMsgs; # Now clean out any messages in %unseen that were not in the %newUnseen and # marked as previously read + $log->dbug("Cleaning out unseen"); for (keys %unseen) { if (defined $newUnseen{$_}) { if ($unseen{$_}) { @@ -193,6 +200,7 @@ sub MonitorMail() { } # if } # for + $log->dbug("Processing new unseen messages"); for (keys %newUnseen) { next if $unseen{$_}; @@ -224,8 +232,10 @@ sub MonitorMail() { # Only announce if after 6 Am. Note this will announce up until # midnight but that's ok. I want midnight to 6 Am as silent time. - if ($hour >= 6) { - Say $msg; + $log->dbug("About to speak/log"); + if ($hour >= 7) { + $log->dbug("Calling speak"); + speak $msg, $log; $log->msg($logmsg); } else { $log->msg("$logmsg [silent]"); @@ -234,32 +244,19 @@ sub MonitorMail() { $unseen{$_} = 1; } # for + # Let's time things + my $startTime = time; + # Re-establish callback + $log->dbug("Evaling idle"); eval { $IMAP->idle(\&MonitorMail) }; # If we return from idle then the server went away for some reason. With Gmail # the server seems to time out around 30-40 minutes. Here we simply reconnect # to the imap server and continue to MonitorMail. - $log->dbug("MonitorMail: Connection to $opts{imap} ended. Reconnecting"); - - # Destroy current IMAP connection - $log->dbug("MonitorMail: Destorying IMAP connection to $opts{imap}"); - - undef $IMAP; + restart; - # Re-establish connection - Connect2IMAP; - - $log->dbug("MonitorMail: Reconnected to IMAP server $opts{imap}"); - - # MonitorMail again - the dreaded goto! Seems the cleanest way to restart - # in this instance. I could call MonitorMail() recursively but that would - # leave junk on the stack. - $log->dbug('MonitorMail: Going back to the top of the loop'); - - goto MONITORMAIL; - - return; # To make perlcritic happy + return; } # MonitorMail END { @@ -267,7 +264,7 @@ END { if ($log) { my $msg = "$FindBin::Script ending unexpectedly!"; - Say $msg; + speak $msg, $log; $log->err($msg); } # if @@ -288,6 +285,7 @@ GetOptions( 'usessl', 'useblocking', 'announce!', + 'append', ) || pod2usage; unless ($opts{password}) { @@ -303,15 +301,16 @@ if ($opts{username} =~ /.*\@(.*)$/) { if ($opts{daemon}) { # Perl complains if we reference $DB::OUT only once - my $foo = $DB::OUT; - EnterDaemonMode unless defined $DB::OUT; + no warnings; + EnterDaemonMode unless defined $DB::OUT or get_debug; + use warnings; } # if $log = Logger->new( - path => '/var/log', + path => '/var/local/log', name => "$Logger::me.$opts{name}", timestamped => 'yes', - append => 'yes', + append => $opts{append}, ); Connect2IMAP; @@ -324,7 +323,7 @@ if ($opts{username} =~ /(.*)\@/) { my $msg = "Now monitoring email for $opts{user}\@$opts{name}"; -Say $msg if $opts{announce}; +speak $msg, $log if $opts{announce}; $log->msg($msg);