X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=bin%2FannounceEmail.pl;h=22d30d01e5a9f1897ec15fa05d1992686c02c8bc;hb=cbfba1c8c330651d563f03ba6e2b04ce48c79896;hp=2826ed37926704919fe858819ba0401e9432f3fd;hpb=89be03cdf0fd811112da15b47d710f7bc3a00e74;p=clearscm.git diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl index 2826ed3..22d30d0 100755 --- a/bin/announceEmail.pl +++ b/bin/announceEmail.pl @@ -33,7 +33,7 @@ $Date: 2019/04/04 13:40:10 $ Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug] [-use|rname ] [-p|assword ] - [-i|map ] + [-i|map ] [-t|imeout ] [-an|nouce] [-ap|pend] [-da|emon] [-n|name ] [-uses|sl] [-useb|locking] @@ -42,10 +42,11 @@ $Date: 2019/04/04 13:40:10 $ -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) + -t|imeout Timeout IMAP idle call (Sefault: 600 seconds or 10 minutes) -an|nounce Announce startup (Default: False) -ap|pend Append to logfile (Default: Noappend) @@ -54,6 +55,10 @@ $Date: 2019/04/04 13:40:10 $ -uses|sl Whether or not to use SSL to connect (Default: False) -useb|locking Whether to block on socket (Default: False) + Signals: + $SIG{USR1}: Toggles debug option + $SIG{USR2}: Reestablishes connection to IMAP server + =head1 DESCRIPTION This script will connect to an IMAP server, login and then monitor the user's @@ -82,6 +87,8 @@ use Speak; use TimeUtils; use Utils; +local $0 = "$FindBin::Script " . join ' ', @ARGV; + my $defaultIMAPServer = 'defaria.com'; my $IMAP; my %unseen; @@ -98,32 +105,58 @@ 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 $icon = '/home/andrew/.icons/Thunderbird.jpg'; +my $timeout = 5 * 1000; + my %opts = ( usage => sub { pod2usage }, help => sub { pod2usage(-verbose => 2)}, verbose => sub { set_verbose }, debug => sub { set_debug }, daemon => 1, + timeout => 600, # 10 minutes username => $ENV{USER}, password => $ENV{PASSWORD}, imap => $defaultIMAPServer, ); +sub notify($) { + my ($msg) = @_; + + my $cmd = "notify-send -i $icon -t $timeout '$msg'"; + + Execute $cmd; + + return; +} # notify + sub interrupted { if (get_debug) { - $log->msg("Turning off debugging"); + notify 'Turning off debugging'; set_debug 0; } else { - $log->msg("Turning on debugging"); + notify ('Turning on debugging'); set_debug 1; } # if 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 @@ -135,6 +168,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}, @@ -156,7 +192,7 @@ sub Connect2IMAP() { } # Connect2IMAP sub MonitorMail() { - MONITORMAIL: +# MONITORMAIL: $log->dbug("Top of MonitorMail loop"); # First close and reselect the INBOX to get its current status @@ -203,6 +239,10 @@ sub MonitorMail() { # Google Talk doesn't like # $subject =~ s/\#//g; + # Remove long strings of numbers like order numbers. They are uninteresting + my $longNumber = 5; + $subject =~ s/\s+\S*\d{$longNumber,}\S*\s*//g; + # Now speak it! my $logmsg = "From $from $subject"; @@ -231,38 +271,27 @@ sub MonitorMail() { # 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 - lasted " - . howlong $startTime); - - # Destroy current IMAP connection - $log->dbug("MonitorMail: Destroying IMAP connection to $opts{imap}"); + eval { $IMAP->idle(\&MonitorMail, $opts{timeout}) }; - undef $IMAP; - - # Re-establish connection - Connect2IMAP; + $log->err("Unable to set IMAP Idle - AS $@", 1) if $@; + $log->msg("IMAP Idle for $opts{name} timed out in " . howlong $startTime, time); - $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'); + # 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 return + # back to main which will re-establish the connection and call us again. + unless ($IMAP->get_response_code('timeout')) { + my $errstr = $IMAP->get_last_error; - goto MONITORMAIL; + $log->dbug("$opts{name} went away - $errstr"); + } # unless - return; # To make perlcritic happy + return 0; } # MonitorMail END { # If $log is not yet defined then the exit is not unexpected if ($log) { - my $msg = "$FindBin::Script ending unexpectedly!"; + my $msg = "$FindBin::Script $opts{name} ended unexpectedly!"; speak $msg, $log; @@ -282,6 +311,7 @@ GetOptions( 'name=s', 'password=s', 'imap=s', + 'timeout=i', 'usessl', 'useblocking', 'announce!', @@ -313,8 +343,6 @@ $log = Logger->new( append => $opts{append}, ); -Connect2IMAP; - if ($opts{username} =~ /(.*)\@/) { $opts{user} = $1; } else { @@ -323,11 +351,20 @@ if ($opts{username} =~ /(.*)\@/) { my $msg = "Now monitoring email for $opts{user}\@$opts{name}"; -speak $msg, $log if $opts{announce}; +# Changed to loop here - better than using a goto. This kinda kills the idea of +# using siguser2 to interrupt announceEmail.pl to kick it into re-establishing +# the connection. +while () { + Connect2IMAP; + + speak $msg, $log if $opts{announce}; + + $log->msg($msg); -$log->msg($msg); + MonitorMail; -MonitorMail; + $log->dbug("$opts{name} timed out! Re-establishing connection"); +} # while # Should not get here $log->err("Falling off the edge of $0", 1);