projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
self-service keepalives
[freeside.git]
/
fs_selfservice
/
FS-SelfService
/
freeside-selfservice-clientd
diff --git
a/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
b/fs_selfservice/FS-SelfService/freeside-selfservice-clientd
index
a8b1e71
..
95e9b9b
100644
(file)
--- a/
fs_selfservice/FS-SelfService/freeside-selfservice-clientd
+++ b/
fs_selfservice/FS-SelfService/freeside-selfservice-clientd
@@
-9,7
+9,7
@@
use subs qw(spawn logmsg lock_write unlock_write);
use Fcntl qw(:flock);
use POSIX qw(:sys_wait_h);
use Socket;
use Fcntl qw(:flock);
use POSIX qw(:sys_wait_h);
use Socket;
-use Storable qw(nstore_fd fd_retrieve);
+use Storable
2.09
qw(nstore_fd fd_retrieve);
use IO::Handle qw(_IONBF);
use IO::Select;
use IO::File;
use IO::Handle qw(_IONBF);
use IO::Select;
use IO::File;
@@
-20,7
+20,8
@@
my $tag = scalar(@ARGV) ? '.'.shift : '';
use vars qw( $Debug );
$Debug = 2; #2 will turn on child logging, 3 will log packet contents,
use vars qw( $Debug );
$Debug = 2; #2 will turn on child logging, 3 will log packet contents,
- #including potentially compromising information
+ #including potentially compromising information, 4 will log
+ #receipts of all packets from server including keepalives (big!)
my $socket = "/usr/local/freeside/selfservice_socket$tag";
my $pid_file = "$socket.pid";
my $socket = "/usr/local/freeside/selfservice_socket$tag";
my $pid_file = "$socket.pid";
@@
-65,6
+66,9
@@
close PIDFILE;
#sub REAPER { $waitedpid = wait; $SIG{CHLD} = \&REAPER; }
#$SIG{CHLD} = \&REAPER;
#sub REAPER { $waitedpid = wait; $SIG{CHLD} = \&REAPER; }
#$SIG{CHLD} = \&REAPER;
+warn "enabling keep alives\n" if $Debug;
+nstore_fd( { _packet => '_enable_keepalive' } , \*STDOUT );
+
warn "entering main loop\n" if $Debug;
my %kids;
warn "entering main loop\n" if $Debug;
my %kids;
@@
-101,10
+105,16
@@
while (1) {
if ( $handle == \*STDIN ) {
if ( $handle == \*STDIN ) {
- warn "receiving packet from server\n" if $Debug;
+ warn "receiving packet from server\n" if $Debug
> 3
;
my $packet = fd_retrieve(\*STDIN);
my $token = $packet->{'_token'};
my $packet = fd_retrieve(\*STDIN);
my $token = $packet->{'_token'};
+
+ if ( $token eq '_keepalive' ) {
+ $undisp = 1;
+ next;
+ }
+
warn "received packet from server with token $token\n".
( $Debug > 2
? join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
warn "received packet from server with token $token\n".
( $Debug > 2
? join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
@@
-145,22
+155,22
@@
while (1) {
#handle some commands weirdly?
$packet->{_token}=$$;
#handle some commands weirdly?
$packet->{_token}=$$;
- warn "[child-$$] locking write stream" if $Debug > 1;
+ warn "[child-$$] locking write stream
\n
" if $Debug > 1;
lock_write;
lock_write;
- warn "[child-$$] sending packet to remote server" if $Debug > 1;
+ warn "[child-$$] sending packet to remote server
\n
" if $Debug > 1;
nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
nstore_fd($packet, \*STDOUT) or die "FATAL: can't send response: $!";
- warn "[child-$$] flushing write stream" if $Debug > 1;
+ warn "[child-$$] flushing write stream
\n
" if $Debug > 1;
STDOUT->flush or die "FATAL: can't flush: $!";
STDOUT->flush or die "FATAL: can't flush: $!";
- warn "[child-$$] releasing write lock" if $Debug > 1;
+ warn "[child-$$] releasing write lock
\n
" if $Debug > 1;
unlock_write;
unlock_write;
- warn "[child-$$] closing write stream" if $Debug > 1;
+ warn "[child-$$] closing write stream
\n
" if $Debug > 1;
close STDOUT or die "FATAL: can't close write stream: $!"; #??!
close STDOUT or die "FATAL: can't close write stream: $!"; #??!
- warn "[child-$$] waiting for response from parent" if $Debug > 1;
+ warn "[child-$$] waiting for response from parent
\n
" if $Debug > 1;
my $w = new IO::Select;
$w->add(\*STDIN);
until ( $w->can_read ) {
my $w = new IO::Select;
$w->add(\*STDIN);
until ( $w->can_read ) {
@@
-233,6
+243,7
@@
sub spawn {
sub _logmsg {
chomp( my $msg = shift );
my $log = new IO::File ">>$log_file";
sub _logmsg {
chomp( my $msg = shift );
my $log = new IO::File ">>$log_file";
+ die "can't open $log_file: $!" unless defined($log);
flock($log, LOCK_EX);
seek($log, 0, 2);
print $log "[client] [". scalar(localtime). "] [$$] $msg\n";
flock($log, LOCK_EX);
seek($log, 0, 2);
print $log "[client] [". scalar(localtime). "] [$$] $msg\n";