Merge pull request #26 from GsDevKit/dev

Issue #25: /opt/gemstone/log is default if GEMSTONE_LOGDIR not defined
GsDevKit · Jan 30, 2015 · eec8f96 · eec8f96
2 parents 577953c + 89cfd3b
commit eec8f96
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/bin/startGemServerGem b/bin/startGemServerGem
@@ -43,7 +43,11 @@ else
   ExeArg="-e $3"
 fi
 
-logFile="${GEMSTONE_LOGDIR}/${GemServer}_server-${Port}.log"
+logDir=${GEMSTONE_LOGDIR}
+if [ "${logDir}x" = "x" ] ; then
+  logDir=/opt/gemstone/log
+fi
+logFile="${logDir}/${GemServer}_server-${Port}.log"
 
 echo "Starting $GemServer on $Port exeConf: -$ExeConf- logFile: -$logFile-"
 

diff --git a/bin/stopGemServerGem b/bin/stopGemServerGem
@@ -4,7 +4,12 @@ GemServer="$1"
 Port="$2"
 
 # must match GemServer>>gemPidFileName:
-pidfile="${GEMSTONE_LOGDIR}/${GemServer}_server-${Port}.pid"
+
+logDir=${GEMSTONE_LOGDIR}
+if [ "${logDir}x" = "x" ] ; then
+  logDir=/opt/gemstone/log
+fi
+pidfile="${logDir}/${GemServer}_server-${Port}.pid"
 
 if [ -e $pidfile ]; then
   pid=`cat $pidfile`