X-Git-Url: http://git.refcnt.org/?p=lugs.git;a=blobdiff_plain;f=lreminder%2Freminder.pl;h=3326424fb9fe427679621e83264dc2b3982b3580;hp=81d898ef98f75362215bcc0e298381a3175324c1;hb=82fc3e72ef3969427e1bdf0bbc578c50bbd74e32;hpb=7297bad447c8eb7feaf9946506f5a337443cfe55

diff --git a/lreminder/reminder.pl b/lreminder/reminder.pl
index 81d898e..3326424 100755
--- a/lreminder/reminder.pl
+++ b/lreminder/reminder.pl
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # Author: Steven Schubiger <stsc@refcnt.org>
-# Last modified: Wed Jul 16 16:17:32 CEST 2014
+# Last modified: Thu Feb  4 23:21:02 CET 2016
 
 use strict;
 use warnings;
@@ -37,7 +37,7 @@ use Text::Wrap::Smart::XS qw(fuzzy_wrap);
 use URI ();
 use WWW::Mechanize ();
 
-my $VERSION = '0.45';
+my $VERSION = '0.52';
 
 #-----------------------
 # Start of configuration
@@ -47,9 +47,12 @@ my $Config = {
     events_url => 'http://www.lugs.ch/lugs/termine/termine.txt',
     form_url   => 'http://lists.lugs.ch/reminder.cgi',
     mail_from  => 'reminder@lugs.ch',
+    mail_admin => 'stsc@refcnt.org',
     dbase_name => '<hidden>',
     dbase_user => '<hidden>',
     dbase_pass => '<hidden>',
+    sleep_secs => 300,
+    max_tries  => 48,
 };
 
 #---------------------
@@ -57,7 +60,7 @@ my $Config = {
 #---------------------
 
 my $dbh  = DBI->connect("dbi:mysql(RaiseError=>1):$Config->{dbase_name}", $Config->{dbase_user}, $Config->{dbase_pass});
-my $file = (URI->new($Config->{events_url})->path_segments)[-1];
+my $file = File::Spec->catfile('tmp', (URI->new($Config->{events_url})->path_segments)[-1]);
 
 my ($test, $run) = (false, false);
 
@@ -89,11 +92,48 @@ sub getopts
 sub fetch_and_write_events
 {
     my $mech = WWW::Mechanize->new;
-    my $http = $mech->get($Config->{events_url});
 
-    open(my $fh, '>', $file) or die "Cannot open $file for writing: $!\n";
-    print {$fh} $http->content;
-    close($fh);
+    my ($http, $retry, $tries);
+    $http = undef;
+
+    do {
+        $retry = false;
+        $tries++;
+        eval {
+            $http = $mech->get($Config->{events_url});
+        } or do {
+            warn "[${\scalar localtime}] $@";
+            $retry = ($tries < $Config->{max_tries}) ? true : false;
+            sleep $Config->{sleep_secs} if $retry;
+        };
+    } while ($retry);
+
+    if (defined $http) {
+        open(my $fh, '>', $file) or die "Cannot open $file for writing: $!\n";
+        print {$fh} $http->content;
+        close($fh);
+    }
+    else {
+        my $script = File::Basename::basename($0);
+        warn "[${\scalar localtime}] $script not entirely run, no http content\n";
+        my $message = <<"MSG";
+hello,
+
+This is lreminder [<$Config->{mail_from}>].
+
+Could not run $script entirely, no http content.
+Please re-run manually with `$0 --run' today.
+
+thanks,
+MSG
+        sendmail(
+            From    => $Config->{mail_from},
+            To      => $Config->{mail_admin},
+            Subject => 'LUGS Reminder - warning: timeout',
+            Message => $message,
+        ) or die "Cannot send mail: $Mail::Sendmail::error";
+        exit;
+    }
 }
 
 sub init
@@ -110,11 +150,8 @@ sub init
                 rewrite => '$TEXT - $HREF',
                 fields  => [ qw(location more) ],
             } ],
-            'br' => [ {
-                rewrite => '',
-                fields  => [ qw(more) ],
-            } ],
         },
+        purge_tags => [ qw(location responsible more) ],
         strip_text => [ 'mailto:' ],
     });
     unlink $file;
@@ -189,7 +226,7 @@ sub send_mail
 
     my $month_name = $month_names{$month};
 
-my $message = (<<MSG);
+my $message = (<<"MSG");
 Wann:\t$wday, $simple_day. $month_name $year, $time Uhr
 Was :\t$title
 Wo  :\t$location
@@ -239,9 +276,9 @@ sub info_string
     my $modified = localtime((stat($0))[9]);
 
     $modified =~ s/(?<=\b) (?:\d{2}\:?){3} (?=\b)//x;
-    $modified =~ s/\s+/ /g;
+    $modified =~ s/\s{2,}/ /g;
 
-    my $info = <<EOT;
+    my $info = <<"EOT";
 -- 
 running $script v$VERSION - last modified: $modified
 EOT