projects
/
twirssi-net-twitter-lite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.7 - r344 - If an update blew up, try it again later
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 47089f7bbcede688a8d6139c498e070164da644e..b049e6f77433f90b45d279f724febc2db8c16773 100644
(file)
--- a/
twirssi.pl
+++ b/
twirssi.pl
@@
-12,7
+12,7
@@
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
$VERSION = "1.7";
use vars qw($VERSION %IRSSI);
$VERSION = "1.7";
-my ($REV) = '$Rev: 34
2
$' =~ /(\d+)/;
+my ($REV) = '$Rev: 34
4
$' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
@@
-21,7
+21,7
@@
my ($REV) = '$Rev: 342 $' =~ /(\d+)/;
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://tinyurl.com/twirssi',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://tinyurl.com/twirssi',
- changed => '$Date: 2009-01-05 16:
26:47
-0800 (Mon, 05 Jan 2009) $',
+ changed => '$Date: 2009-01-05 16:
40:46
-0800 (Mon, 05 Jan 2009) $',
);
my $window;
);
my $window;
@@
-605,7
+605,7
@@
sub get_updates {
my $pid = fork();
if ($pid) { # parent
my $pid = fork();
if ($pid) { # parent
- Irssi::timeout_add_once( 5000, 'monitor_child', [
$filename
] );
+ Irssi::timeout_add_once( 5000, 'monitor_child', [
$filename, 0
] );
Irssi::pidwait_add($pid);
} elsif ( defined $pid ) { # child
close STDIN;
Irssi::pidwait_add($pid);
} elsif ( defined $pid ) { # child
close STDIN;
@@
-614,10
+614,11
@@
sub get_updates {
my $new_poll = time;
my $new_poll = time;
- &do_updates( $fh, $user, $twit );
+ my $error = 0;
+ $error += &do_updates( $fh, $user, $twit );
foreach ( keys %twits ) {
next if $_ eq $user;
foreach ( keys %twits ) {
next if $_ eq $user;
- &do_updates( $fh, $_, $twits{$_} );
+
$error +=
&do_updates( $fh, $_, $twits{$_} );
}
my ( $added, $removed ) = &load_friends($fh);
}
my ( $added, $removed ) = &load_friends($fh);
@@
-632,7
+633,13
@@
sub get_updates {
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
}
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
}
- print $fh $new_poll;
+
+ if ($error) {
+ print $fh "type:error Update encountered errors. Aborted\n";
+ print $fh $last_poll;
+ } else {
+ print $fh $new_poll;
+ }
close $fh;
exit;
}
close $fh;
exit;
}
@@
-652,7
+659,7
@@
sub do_updates {
if ($@) {
print $fh "type:error Error during friends_timeline call. Aborted.\n";
if ($@) {
print $fh "type:error Error during friends_timeline call. Aborted.\n";
- return;
+ return
1
;
}
foreach my $t ( reverse @$tweets ) {
}
foreach my $t ( reverse @$tweets ) {
@@
-695,7
+702,7
@@
sub do_updates {
if ($@) {
print $fh "type:error Error during replies call. Aborted.\n";
if ($@) {
print $fh "type:error Error during replies call. Aborted.\n";
- return;
+ return
1
;
}
foreach my $t ( reverse @$tweets ) {
}
foreach my $t ( reverse @$tweets ) {
@@
-718,7
+725,7
@@
sub do_updates {
if ($@) {
print $fh "type:error Error during direct_messages call. Aborted.\n";
if ($@) {
print $fh "type:error Error during direct_messages call. Aborted.\n";
- return;
+ return
1
;
}
foreach my $t ( reverse @$tweets ) {
}
foreach my $t ( reverse @$tweets ) {
@@
-729,10
+736,12
@@
sub do_updates {
$t->{id}, $username, $t->{sender_screen_name}, $text;
}
print scalar localtime, " - Done" if &debug;
$t->{id}, $username, $t->{sender_screen_name}, $text;
}
print scalar localtime, " - Done" if &debug;
+
+ return 0;
}
sub monitor_child {
}
sub monitor_child {
- my
$data = shift
;
+ my
( $data, $attempt ) = @_
;
my $filename = $data->[0];
print scalar localtime, " - checking child log at $filename" if &debug;
my $filename = $data->[0];
print scalar localtime, " - checking child log at $filename" if &debug;
@@
-828,7
+837,14
@@
sub monitor_child {
}
close FILE;
}
close FILE;
- Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+
+ if ( $attempt < 12 ) {
+ Irssi::timeout_add_once( 5000, 'monitor_child',
+ [ $filename, $attempt + 1 ] );
+ } else {
+ ¬ice("Giving up on polling $filename");
+ unlink $filename unless &debug;
+ }
}
sub debug {
}
sub debug {