From d0d9c93d9845946b813d74d7296eec979f59c13a Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Sat, 17 Jan 2015 00:02:05 -0500 Subject: [PATCH] As get_config already dies on failure to find a match, remove the || dies after calling it. --- bucardo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bucardo b/bucardo index 04cc5a815..9bc658880 100755 --- a/bucardo +++ b/bucardo @@ -322,18 +322,18 @@ $dbh->commit(); ## Set some global variables based on information from the bucardo_config table ## The reason file records startup and shutdown messages -$REASONFILE = get_config('reason_file') or die "Invalid reason_file!\n"; +$REASONFILE = get_config('reason_file'); ($REASONFILE_LOG = $REASONFILE) =~ s{(?:[.][^.]+)?$}{.log}; ## The directory Bucardo.pm writes PID and other information to -my $PIDDIR = $bcargs->{piddir} || get_config('piddir') or die "Invalid piddir!\n"; +my $PIDDIR = $bcargs->{piddir} || get_config('piddir'); ## The PID file of the master control file (MCP) ## If this exists, it is a good bet that Bucardo is currently running my $PIDFILE = "$PIDDIR/bucardo.mcp.pid"; ## The stop file whose existence tells all Bucardo processes to exit immediately -my $stopfile = get_config('stopfile') or die "Invalid stopfile!\n"; +my $stopfile = get_config('stopfile'); $STOPFILE = "$PIDDIR/$stopfile"; ## Aliases for terms people may shorten, misspell, etc. -- 2.39.5