Revert "LP#1339190 worker-keeplive typo repair" collab/berick/multi-relais-timeout-keepalive
authorMike Rylander <mrylander@gmail.com>
Wed, 20 Aug 2014 15:48:24 +0000 (11:48 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 20 Aug 2014 15:50:03 +0000 (11:50 -0400)
This reverts commit 21f77d36021bbcb39c5a6afc273457bf254e9ba5.

Those weren't actually typos, but intentional to allow "0", which
turns off keepalive for that account or institution.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
SIPServer.pm

index a4358a3..d16eec3 100755 (executable)
@@ -436,8 +436,8 @@ sub mux_input {
             $self->sip_protocol_loop(
                 $active_connections{$conn_id}{worker_pipe},
                 $self->{account}->{'worker-keepalive'}
-                    || $self->{institution}->{'worker-keepalive'}
-                    || $worker_keepalive
+                    // $self->{institution}->{'worker-keepalive'}
+                    // $worker_keepalive
             );
 
             exit(0);
@@ -497,8 +497,8 @@ sub mux_input {
                 $self->sip_protocol_loop(
                     $active_connections{$conn_id}{worker_pipe},
                     $self->{account}->{'worker-keepalive'}
-                        || $self->{institution}->{'worker-keepalive'}
-                        || $worker_keepalive
+                        // $self->{institution}->{'worker-keepalive'}
+                        // $worker_keepalive
                 );