From 8882f175092090b4ce5b25450eb70e28a9c0a95a Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 6 Apr 2016 20:12:32 +0200 Subject: [PATCH] Added logging to home directory for userland services --- dev/debug_osync.sh | 12 ++++++++---- dev/n_osync.sh | 8 +++++--- osync.sh | 12 ++++++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index ea25ede..bda45b4 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -4,10 +4,10 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-dev -PROGRAM_BUILD=2016040305 +PROGRAM_BUILD=2016040602 IS_STABLE=yes -## FUNC_BUILD=2016040301 +## FUNC_BUILD=2016040601 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -63,6 +63,8 @@ LOCAL_HOST=$(hostname) ## Default log file until config file is loaded if [ -w /var/log ]; then LOG_FILE="/var/log/$PROGRAM.log" +elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then + LOG_FILE="$HOME/$PROGRAM.log" else LOG_FILE="./$PROGRAM.log" fi @@ -2764,9 +2766,11 @@ opts="${opts# *}" if [ "$LOGFILE" == "" ]; then if [ -w /var/log ]; then - LOG_FILE=/var/log/$PROGRAM.$INSTANCE_ID.log + LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" + elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then + LOG_FILE="$HOME/$PROGRAM.$INSTANCE_ID.log" else - LOG_FILE=./$PROGRAM.$INSTANCE_ID.log + LOG_FILE="./$PROGRAM.$INSTANCE_ID.log" fi else LOG_FILE="$LOGFILE" diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 6708aeb..7941e72 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-dev -PROGRAM_BUILD=2016040305 +PROGRAM_BUILD=2016040602 IS_STABLE=yes source "./ofunctions.sh" @@ -1717,9 +1717,11 @@ opts="${opts# *}" if [ "$LOGFILE" == "" ]; then if [ -w /var/log ]; then - LOG_FILE=/var/log/$PROGRAM.$INSTANCE_ID.log + LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" + elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then + LOG_FILE="$HOME/$PROGRAM.$INSTANCE_ID.log" else - LOG_FILE=./$PROGRAM.$INSTANCE_ID.log + LOG_FILE="./$PROGRAM.$INSTANCE_ID.log" fi else LOG_FILE="$LOGFILE" diff --git a/osync.sh b/osync.sh index 88f736b..9da0850 100755 --- a/osync.sh +++ b/osync.sh @@ -4,10 +4,10 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-dev -PROGRAM_BUILD=2016040305 +PROGRAM_BUILD=2016040602 IS_STABLE=yes -## FUNC_BUILD=2016040301 +## FUNC_BUILD=2016040601 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -59,6 +59,8 @@ LOCAL_HOST=$(hostname) ## Default log file until config file is loaded if [ -w /var/log ]; then LOG_FILE="/var/log/$PROGRAM.log" +elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then + LOG_FILE="$HOME/$PROGRAM.log" else LOG_FILE="./$PROGRAM.log" fi @@ -2655,9 +2657,11 @@ opts="${opts# *}" if [ "$LOGFILE" == "" ]; then if [ -w /var/log ]; then - LOG_FILE=/var/log/$PROGRAM.$INSTANCE_ID.log + LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" + elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then + LOG_FILE="$HOME/$PROGRAM.$INSTANCE_ID.log" else - LOG_FILE=./$PROGRAM.$INSTANCE_ID.log + LOG_FILE="./$PROGRAM.$INSTANCE_ID.log" fi else LOG_FILE="$LOGFILE"