svn commit: r1438664 - in /incubator/hcatalog/branches/branch-0.5: CHANGES.txt bin/hcat_server.sh webhcat/svr/src/main/bin/webhcat_config.sh

[tr...@apache.org]

Author: travis
Date: Fri Jan 25 19:48:26 2013
New Revision: 1438664

URL: http://svn.apache.org/viewvc?rev=1438664&view=rev
Log:
HCATALOG-604 add flexibility wrt. location of PID/LOG files

Modified:
    incubator/hcatalog/branches/branch-0.5/CHANGES.txt
    incubator/hcatalog/branches/branch-0.5/bin/hcat_server.sh
    incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_config.sh

Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1438664&r1=1438663&r2=1438664&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Fri Jan 25 19:48:26 2013
@@ -45,6 +45,8 @@ Release 0.5.0 - Unreleased
   HCAT-427 Document storage-based authorization (lefty via gates)
 
   IMPROVEMENTS
+  HCAT-604 add flexibility wrt. location of PID/LOG files (rvs via traviscrawford)
+
   HCAT-602 release notes for hcatalog 0.0.5 (traviscrawford)
 
   HCAT-595 Update hcatalog hive dependency to 0.10.0 (traviscrawford)

Modified: incubator/hcatalog/branches/branch-0.5/bin/hcat_server.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/bin/hcat_server.sh?rev=1438664&r1=1438663&r2=1438664&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/bin/hcat_server.sh (original)
+++ incubator/hcatalog/branches/branch-0.5/bin/hcat_server.sh Fri Jan 25 19:48:26 2013
@@ -21,7 +21,8 @@ bin=`which $0`
 bin=`dirname ${bin}`
 bin=`cd "$bin"; pwd`
 
-HCAT_LOG_DIR="$bin"/../var/log
+HCAT_LOG_DIR=${HCAT_LOG_DIR:-"$bin"/../var/log}
+HCAT_PID_DIR=${HCAT_PID_DIR:-$HCAT_LOG_DIR}
 
 if [ -e "$bin/../libexec/hcat-config.sh" ]; then
   . "$bin"/../libexec/hcat-config.sh
@@ -37,7 +38,7 @@ function print_usage() {
 
 function start_hcat() {
   # back ground the metastore service and record the pid
-  PID_FILE=${HCAT_LOG_DIR}/hcat.pid
+  PID_FILE=${HCAT_PID_DIR}/hcat.pid
   SLEEP_TIME_AFTER_START=15
 
   # check if service is already running, if so exit
@@ -112,7 +113,7 @@ function start_hcat() {
 function stop_hcat() {
   SLEEP_TIME_AFTER_KILL=30
 
-  PID_FILE=${HCAT_LOG_DIR}/hcat.pid
+  PID_FILE=${HCAT_PID_DIR}/hcat.pid
   echo looking for $PID_FILE
 
   # check if service is already running, if so exit

Modified: incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_config.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1438664&r1=1438663&r2=1438664&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_config.sh (original)
+++ incubator/hcatalog/branches/branch-0.5/webhcat/svr/src/main/bin/webhcat_config.sh Fri Jan 25 19:48:26 2013
@@ -26,8 +26,6 @@
 PID_DIR=${WEBHCAT_PID_DIR:-.}
 PID_FILE=${PID_DIR}/webhcat.pid
 
-PID_FILE=./webhcat.pid
-
 #default log directory
 WEBHCAT_LOG_DIR=${WEBHCAT_LOG_DIR:-.}