From 92f28dc3059f8d6b1d2ef15c70613a5f6dd3c6b1 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Thu, 15 May 2014 12:24:57 +0100 Subject: [PATCH] [PASSED QA] Bug 12263 Fix startup issues blocking response to HUP If you do a kill -s HUP sipserver_pid the server process should restart its children. This was not happening although it was logging the commencement of the process. Removed traces of Exporter usage this was always incorrect this program inherits from Net::Server 'use base' to make inheritance clearer. Removed unnecessary begin block made file executable so it can run added a shebang line so OS knows to invoke perl to compile and run the file. I've removed the debug code dumping the config to STDOUT, it should not have gone into the production version. One of the first things this program does is close stdout etc and reopens the sip sockets to them. Assuming you can print to them other than as part of the sip dialogue is not always safe. Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall --- C4/SIP/SIPServer.pm | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) mode change 100644 => 100755 C4/SIP/SIPServer.pm diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm old mode 100644 new mode 100755 index 44c58b4..45d8007 --- a/C4/SIP/SIPServer.pm +++ b/C4/SIP/SIPServer.pm @@ -1,31 +1,24 @@ +#!/usr/bin/perl package SIPServer; use strict; use warnings; use FindBin qw($Bin); use lib "$Bin"; -# use Exporter; use Sys::Syslog qw(syslog); use Net::Server::PreFork; use IO::Socket::INET; use Socket qw(:DEFAULT :crlf); -use Data::Dumper; # For debugging require UNIVERSAL::require; -#use Sip qw(readline); use Sip::Constants qw(:all); use Sip::Configuration; use Sip::Checksum qw(checksum verify_cksum); use Sip::MsgType; -use constant LOG_SIP => "local6"; # Local alias for the logging facility - -use vars qw(@ISA $VERSION); +use base qw(Net::Server::PreFork); -BEGIN { - $VERSION = 3.07.00.049; - @ISA = qw(Net::Server::PreFork); -} +use constant LOG_SIP => "local6"; # Local alias for the logging facility # # Main # not really, since package SIPServer @@ -43,7 +36,6 @@ my %transports = ( # Read configuration # my $config = new Sip::Configuration $ARGV[0]; -print STDERR "SIPServer config: \n" . Dumper($config) . "\nEND SIPServer config.\n"; my @parms; # @@ -75,8 +67,6 @@ if (defined($config->{'server-params'})) { } } -print scalar(localtime), " -- startup -- procid:$$\n"; -print "Params for Net::Server::PreFork : \n" . Dumper(\@parms); # # This is the main event. -- 1.7.2.5