From 7ea9478a7c5c0012868f26902d22a9033a132965 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 22 Feb 2017 17:22:00 +0000
Subject: [PATCH] changes for proc service config

---
 .../dm/common/utility/configurationManager.py | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/python/dm/common/utility/configurationManager.py b/src/python/dm/common/utility/configurationManager.py
index 45c3d2dc..73753c5f 100755
--- a/src/python/dm/common/utility/configurationManager.py
+++ b/src/python/dm/common/utility/configurationManager.py
@@ -47,6 +47,8 @@ DEFAULT_DM_DAQ_WEB_SERVICE_PORT = 33336    # 333DM
 DEFAULT_DM_DAQ_WEB_SERVICE_HOST = '127.0.0.1'
 DEFAULT_DM_CAT_WEB_SERVICE_PORT = 44436    # 444DM
 DEFAULT_DM_CAT_WEB_SERVICE_HOST = '127.0.0.1'
+DEFAULT_DM_PROC_WEB_SERVICE_PORT = 55536    # 555DM
+DEFAULT_DM_PROC_WEB_SERVICE_HOST = '127.0.0.1'
 
 DEFAULT_DM_DB = 'postgresql'
 DEFAULT_DM_DB_HOST = '127.0.0.1'
@@ -144,6 +146,8 @@ class ConfigurationManager(UserDict.UserDict):
         self['defaultDsWebServiceHost'] = DEFAULT_DM_DS_WEB_SERVICE_HOST
         self['defaultCatWebServicePort'] = DEFAULT_DM_CAT_WEB_SERVICE_PORT
         self['defaultCatWebServiceHost'] = DEFAULT_DM_CAT_WEB_SERVICE_HOST
+        self['defaultProcWebServicePort'] = DEFAULT_DM_PROC_WEB_SERVICE_PORT
+        self['defaultProcWebServiceHost'] = DEFAULT_DM_PROC_WEB_SERVICE_HOST
 
         self['defaultDb'] = DEFAULT_DM_DB
         self['defaultDbHost'] = DEFAULT_DM_DB_HOST
@@ -187,6 +191,8 @@ class ConfigurationManager(UserDict.UserDict):
         self.__setFromEnvVar('dsWebServicePort', 'DM_DS_WEB_SERVICE_PORT')
         self.__setFromEnvVar('catWebServiceHost', 'DM_CAT_WEB_SERVICE_HOST')
         self.__setFromEnvVar('catWebServicePort', 'DM_CAT_WEB_SERVICE_PORT')
+        self.__setFromEnvVar('procWebServiceHost', 'DM_PROC_WEB_SERVICE_HOST')
+        self.__setFromEnvVar('procWebServicePort', 'DM_PROC_WEB_SERVICE_PORT')
 
         self.__setFromEnvVar('contextRoot', 'DM_CONTEXT_ROOT')
 
@@ -626,6 +632,30 @@ class ConfigurationManager(UserDict.UserDict):
     def hasCatWebServiceHost(self):
         return self.has_key('catWebServiceHost')
 
+    def getDefaultProcWebServicePort(self):
+        return self['defaultProcWebServicePort']
+
+    def setProcWebServicePort(self, procWebServicePort):
+        self['procWebServicePort'] = procWebServicePort 
+
+    def getProcWebServicePort(self, default='__dm_default__'):
+        return int(self.__getKeyValue('procWebServicePort', default))
+
+    def hasProcWebServicePort(self):
+        return self.has_key('procWebServicePort')
+
+    def getDefaultProcWebServiceHost(self):
+        return self['defaultProcWebServiceHost']
+
+    def setProcWebServiceHost(self, procWebServiceHost):
+        self['procWebServiceHost'] = procWebServiceHost
+
+    def getProcWebServiceHost(self, default='__dm_default__'):
+        return self.__getKeyValue('procWebServiceHost', default)
+
+    def hasProcWebServiceHost(self):
+        return self.has_key('procWebServiceHost')
+
     def getDefaultDb(self):
         return self['defaultDb']
 
-- 
GitLab