projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in setbg
[clearscm.git]
/
bin
/
announceEmail.pl
diff --git
a/bin/announceEmail.pl
b/bin/announceEmail.pl
index
cf3dc49
..
cb6667b
100755
(executable)
--- a/
bin/announceEmail.pl
+++ b/
bin/announceEmail.pl
@@
-33,19
+33,20
@@
$Date: 2019/04/04 13:40:10 $
Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug]
[-use|rname <username>] [-p|assword <password>]
Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug]
[-use|rname <username>] [-p|assword <password>]
- [-i|map <server>]
+ [-i|map <server>]
[-t|imeout <secs>]
[-an|nouce] [-ap|pend] [-da|emon] [-n|name <name>]
[-uses|sl] [-useb|locking]
Where:
-usa|ge Print this usage
-h|elp Detailed help
[-an|nouce] [-ap|pend] [-da|emon] [-n|name <name>]
[-uses|sl] [-useb|locking]
Where:
-usa|ge Print this usage
-h|elp Detailed help
- -v|erbose Verbose mode (Default:
Not
verbose)
+ -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)
-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 <s> Timeout IMAP idle call (Sefault: 1200 seconds or 20 minutes)
-an|nounce Announce startup (Default: False)
-ap|pend Append to logfile (Default: Noappend)
-an|nounce Announce startup (Default: False)
-ap|pend Append to logfile (Default: Noappend)
@@
-74,9
+75,10
@@
use warnings;
use FindBin;
use Getopt::Long;
use FindBin;
use Getopt::Long;
-use Pod::Usage;
use Mail::IMAPTalk;
use MIME::Base64;
use Mail::IMAPTalk;
use MIME::Base64;
+use Pod::Usage;
+use Proc::ProcessTable;
use lib "$FindBin::Bin/../lib";
use lib "$FindBin::Bin/../lib";
@@
-86,6
+88,18
@@
use Speak;
use TimeUtils;
use Utils;
use TimeUtils;
use Utils;
+local $0 = "$FindBin::Script " . join ' ', @ARGV;
+
+my $processes = Proc::ProcessTable->new;
+
+for my $process (@{$processes->table}) {
+ if ($process->cmndline eq $0 and $process->pid != $$) {
+ verbose "$FindBin::Script already running";
+
+ exit 0;
+ } # if
+} # for
+
my $defaultIMAPServer = 'defaria.com';
my $IMAP;
my %unseen;
my $defaultIMAPServer = 'defaria.com';
my $IMAP;
my %unseen;
@@
-105,8
+119,9
@@
my @greetings = (
"What's this? A new message",
);
"What's this? A new message",
);
-my $icon = '/home/andrew/.icons/Thunderbird.jpg';
-my $timeout = 5 * 1000;
+my $icon = '/home/andrew/.icons/Thunderbird.jpg';
+my $notifyTimeout = 5 * 1000;
+my $IMAPTimeout = 20 * 60;
my %opts = (
usage => sub { pod2usage },
my %opts = (
usage => sub { pod2usage },
@@
-114,6
+129,7
@@
my %opts = (
verbose => sub { set_verbose },
debug => sub { set_debug },
daemon => 1,
verbose => sub { set_verbose },
debug => sub { set_debug },
daemon => 1,
+ timeout => $IMAPTimeout,
username => $ENV{USER},
password => $ENV{PASSWORD},
imap => $defaultIMAPServer,
username => $ENV{USER},
password => $ENV{PASSWORD},
imap => $defaultIMAPServer,
@@
-122,7
+138,7
@@
my %opts = (
sub notify($) {
my ($msg) = @_;
sub notify($) {
my ($msg) = @_;
- my $cmd = "notify-send -i $icon -t $
t
imeout '$msg'";
+ my $cmd = "notify-send -i $icon -t $
notifyT
imeout '$msg'";
Execute $cmd;
Execute $cmd;
@@
-141,9
+157,18
@@
sub interrupted {
return;
} # interrupted
return;
} # interrupted
-sub restart;
-
sub Connect2IMAP;
sub Connect2IMAP;
+sub MonitorMail;
+
+sub restart {
+ my $msg = "Re-establishing connection to $opts{imap} as $opts{username}";
+
+ $log->dbug($msg);
+
+ Connect2IMAP;
+
+ MonitorMail;
+} # restart
$SIG{USR1} = \&interrupted;
$SIG{USR2} = \&restart;
$SIG{USR1} = \&interrupted;
$SIG{USR2} = \&restart;
@@
-238,19
+263,17
@@
sub MonitorMail() {
my $greeting = $greetings[int rand $#greetings];
my $msg = "$greeting from $from... $subject";
my $greeting = $greetings[int rand $#greetings];
my $msg = "$greeting from $from... $subject";
- $msg =~ s/\"/\\"/g;
-
- my $hour = (localtime)[2];
+ my $hour = (localtime)[2];
# 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.
$log->dbug("About to speak/log");
if ($hour >= 7) {
# 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.
$log->dbug("About to speak/log");
if ($hour >= 7) {
+ $log->msg($logmsg);
$log->dbug("Calling speak");
speak $msg, $log;
$log->dbug("Calling speak");
speak $msg, $log;
- $log->msg($logmsg);
} else {
} else {
- $log->msg("$logmsg [silent]");
+ $log->msg("$logmsg [silent
nighttime
]");
} # if
$unseen{$_} = 1;
} # if
$unseen{$_} = 1;
@@
-260,31
+283,37
@@
sub MonitorMail() {
my $startTime = time;
# Re-establish callback
my $startTime = time;
# Re-establish callback
- $log->dbug("Evaling idle");
- eval { $IMAP->idle(\&MonitorMail) };
+ $log->dbug("Calling IMAP->idle");
+ eval {
+ $IMAP->idle(\&MonitorMail, $opts{timeout})
+ };
+
+ my $msg = 'Returned from IMAP->idle ';
+
+ if ($@) {
+ speak($msg . $@, $log);
+ } else {
+ $log->msg($msg . 'no error');
+ } # if
# 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.
# 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.
- restart;
+ unless ($IMAP->get_response_code('timeout')) {
+ $msg = "IMAP Idle for $opts{name} timed out in " . howlong $startTime, time;
- return;
-} # MonitorMail
+ speak $msg;
-sub restart {
- my $msg = "Re-establishing connection to $opts{imap} as $opts{username}";
-
- $log->dbug($msg);
-
- Connect2IMAP;
+ $log->msg($msg);
+ } # unless
-
MonitorMail
;
-} #
restart
+
restart
;
+} #
MonitorMail
END {
# If $log is not yet defined then the exit is not unexpected
if ($log) {
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}
ending unexpectedly!";
speak $msg, $log;
speak $msg, $log;
@@
-304,6
+333,7
@@
GetOptions(
'name=s',
'password=s',
'imap=s',
'name=s',
'password=s',
'imap=s',
+ 'timeout=i',
'usessl',
'useblocking',
'announce!',
'usessl',
'useblocking',
'announce!',