python scripts modified to account for pid file env variable

src/bin/metadata_config.py

@@ -30,9 +30,10 @@ CONF = "conf"
 LOG="logs"
 WEBAPP="server" + os.sep + "webapp"
 DATA="data"
-ENV_KEYS = ["JAVA_HOME", "METADATA_OPTS", "METADATA_LOG_DIR", "METADATA_CONF", "METADATACPPATH", "METADATA_DATA_DIR", "METADATA_HOME_DIR", "METADATA_EXPANDED_WEBAPP_DIR"]
+ENV_KEYS = ["JAVA_HOME", "METADATA_OPTS", "METADATA_LOG_DIR", "METADATA_PID_DIR", "METADATA_CONF", "METADATACPPATH", "METADATA_DATA_DIR", "METADATA_HOME_DIR", "METADATA_EXPANDED_WEBAPP_DIR"]
 METADATA_CONF = "METADATA_CONF"
 METADATA_LOG = "METADATA_LOG_DIR"
+METADATA_PID = "METADATA_PID_DIR"
 METADATA_WEBAPP = "METADATA_EXPANDED_WEBAPP_DIR"
 METADATA_OPTS = "METADATA_OPTS"
 METADATA_DATA = "METADATA_DATA_DIR"
@@ -62,6 +63,10 @@ def logDir(dir):
     localLog = os.path.join(dir, LOG)
     return os.environ.get(METADATA_LOG, localLog)
 
+def pidFile(dir):
+    localPid = os.path.join(dir, LOG)
+    return os.path.join(os.environ.get(METADATA_PID, localPid), 'metadata.pid')
+
 def dataDir(dir):
     data = os.path.join(dir, DATA)
     return os.environ.get(METADATA_DATA, data)

src/bin/metadata_start.py

@@ -51,7 +51,7 @@ def main():
                        + os.path.join(web_app_dir, "metadata", "WEB-INF", "lib", "*" )  + p \
                        + os.path.join(metadata_home, "libext", "*")
 
-    metadata_pid_file = os.path.join(logdir, "metadata.pid")
+    metadata_pid_file = mc.pidFile(metadata_home)
 
     if os.path.isfile(metadata_pid_file):
         print "%s already exists, exiting" % metadata_pid_file

src/bin/metadata_stop.py

@@ -28,7 +28,7 @@ def main():
     piddir = mc.dirMustExist(mc.logDir(metadata_home))
     mc.executeEnvSh(confdir)
 
-    metadata_pid_file = os.path.join(piddir, "metadata.pid")
+    metadata_pid_file = mc.pidFile(metadata_home)
 
     try:
         pf = file(metadata_pid_file, 'r')