Verified Commit aae91654 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Fix: improve configuration load procedure at the get-logs scripts

parent 4b9e0c92

onionspray-get-logs-from-remotes

+3 −1
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ EXCLUDES='*' 
# Load config

if [ -e "onionspray-get-logs-from-remotes.conf" ]; then

  source onionspray-get-logs-from-remotes.conf

elif [ -e "$DIRNAME/onionspray-get-logs-from-remotes.conf" ]; then

  source $DIRNAME/onionspray-get-logs-from-remotes.conf

else

  source onionspray-get-logs-from-remotes.conf.sample

  source $DIRNAME/onionspray-get-logs-from-remotes.conf.sample

fi



# Dispatch

onionspray-get-logs-from-s3

+3 −1
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ WORK="$DIRNAME/logs" 
# Load config

if [ -e "onionspray-get-logs-from-s3.conf" ]; then

  source onionspray-get-logs-from-s3.conf

elif [ -e "$DIRNAME/onionspray-get-logs-from-s3.conf" ]; then

  source $DIRNAME/onionspray-get-logs-from-s3.conf

else

  source onionspray-get-logs-from-s3.conf.sample

  source $DIRNAME/onionspray-get-logs-from-s3.conf.sample

fi



# Prepare

onionspray-get-logs-from-s3fs

+3 −1
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ EXIT="0" 
# Load config

if [ -e "onionspray-get-logs-from-s3fs.conf" ]; then

  source onionspray-get-logs-from-s3fs.conf

elif [ -e "$DIRNAME/onionspray-get-logs-from-s3fs.conf" ]; then

  source $DIRNAME/onionspray-get-logs-from-s3fs.conf

else

  source onionspray-get-logs-from-s3fs.conf.sample

  source $DIRNAME/onionspray-get-logs-from-s3fs.conf.sample

fi



# Error function