From 11701357aa5b27b6db1c9f915d224ec817f4cff7 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 24 May 2016 09:01:32 -0500 Subject: [PATCH] remove one unlink, add better error reporting to the rest --- scripts/zmdc.pl.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in index e70c4d568..9bc177090 100644 --- a/scripts/zmdc.pl.in +++ b/scripts/zmdc.pl.in @@ -262,7 +262,8 @@ sub run killAll( 1 ); socket( SERVER, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" ); - unlink( main::SOCK_FILE ) or Error( "Unable to unlink " . main::SOCK_FILE ); +# Fails every time. Does not appear to be necessary. +# unlink( main::SOCK_FILE ) or Error( "Unable to unlink " . main::SOCK_FILE .". Error message was: $!" ); bind( SERVER, $saddr ) or Fatal( "Can't bind to " . main::SOCK_FILE . ": $!" ); listen( SERVER, SOMAXCONN ) or Fatal( "Can't listen: $!" ); @@ -374,8 +375,8 @@ sub run .strftime( '%y/%m/%d %H:%M:%S', localtime() ) ."\n" ); - unlink( main::SOCK_FILE ); - unlink( ZM_PID ); + unlink( main::SOCK_FILE ) or Error( "Unable to unlink " . main::SOCK_FILE .". Error message was: $!" ); + unlink( ZM_PID ) or Error( "Unable to unlink " . ZM_PID .". Error message was: $!" ); exit(); } @@ -760,8 +761,8 @@ sub shutdownAll .strftime( '%y/%m/%d %H:%M:%S', localtime() ) ."\n" ); - unlink( main::SOCK_FILE ); - unlink( ZM_PID ); + unlink( main::SOCK_FILE ) or Error( "Unable to unlink " . main::SOCK_FILE .". Error message was: $!" ); + unlink( ZM_PID ) or Error( "Unable to unlink " . ZM_PID .". Error message was: $!" ); close( CLIENT ); close( SERVER ); exit();