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
Make sure we don't leave pids in the pidwait_*() list once we're done with our forked...
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 48b01087556da95a53da05914d4322f6755dd864..eb878bf205db717e4a49b7abeec4bbb4c712e11e 100644
(file)
--- a/
twirssi.pl
+++ b/
twirssi.pl
@@
-11,7
+11,7
@@
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.
5
beta";
+$VERSION = "2.2.
6
beta";
my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
@@
-38,6
+38,7
@@
my %tweet_cache;
my %id_map;
my $failwhale = 0;
my $first_call = 1;
my %id_map;
my $failwhale = 0;
my $first_call = 1;
+my $child_pid;
my %irssi_to_mirc_colors = (
'%k' => '01',
my %irssi_to_mirc_colors = (
'%k' => '01',
@@
-504,7
+505,9
@@
sub cmd_login {
return;
}
return;
}
- if ( my $timeout = Irssi::settings_get_int("twitter_timeout") and $twit->can('ua')) {
+ if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+ and $twit->can('ua') )
+ {
$twit->ua->timeout($timeout);
}
$twit->ua->timeout($timeout);
}
@@
-774,13
+777,13
@@
sub get_updates {
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
-
my $
pid = fork();
+
$child_
pid = fork();
- if ($pid) { # parent
+ if ($
child_
pid) { # parent
Irssi::timeout_add_once( 5000, 'monitor_child',
[ "$filename.done", 0 ] );
Irssi::timeout_add_once( 5000, 'monitor_child',
[ "$filename.done", 0 ] );
- Irssi::pidwait_add($pid);
- } elsif ( defined $pid ) { # child
+ Irssi::pidwait_add($
child_
pid);
+ } elsif ( defined $
child_
pid ) { # child
close STDIN;
close STDOUT;
close STDERR;
close STDIN;
close STDOUT;
close STDERR;
@@
-1220,6
+1223,9
@@
sub monitor_child {
delete $tweet_cache{$_};
}
$last_poll = $new_last_poll;
delete $tweet_cache{$_};
}
$last_poll = $new_last_poll;
+
+ # make sure the pid is removed from the waitpid list
+ Irssi::pidwait_remove($child_pid);
# save id_map hash
if ( keys %id_map
# save id_map hash
if ( keys %id_map
@@
-1520,7
+1526,7
@@
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
".irssi/scripts/twirssi.json" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
".irssi/scripts/twirssi.json" );
Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
-Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout",
30 );
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
@@
-1592,11
+1598,22
@@
if ($window) {
Irssi::command_bind(
"twirssi_version",
sub {
Irssi::command_bind(
"twirssi_version",
sub {
- ¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ ¬ice(
+ "Twirssi v$VERSION (r$REV); "
+ . (
+ $Net::Twitter::VERSION
+ ? "Net::Twitter v$Net::Twitter::VERSION. "
+ : ""
+ )
+ . (
+ $Net::Identica::VERSION
+ ? "Net::Identica v$Net::Identica::VERSION. "
+ : ""
+ )
. "JSON in use: "
. JSON::Any::handler()
. "JSON in use: "
. JSON::Any::handler()
- . ". See details at http://twirssi.com/" );
+ . ". See details at http://twirssi.com/"
+ );
}
);
Irssi::command_bind(
}
);
Irssi::command_bind(