diff --git a/packaging/siterm-site-agent/scripts/siterm-prompush b/packaging/siterm-site-agent/scripts/siterm-prompush index 30203ab8..16abb0b3 100644 --- a/packaging/siterm-site-agent/scripts/siterm-prompush +++ b/packaging/siterm-site-agent/scripts/siterm-prompush @@ -24,7 +24,7 @@ class MyDaemon(Daemon): def getThreads(self): """Multi threading. Allow multiple sites under single FE""" outThreads = {} - workDir = self.config.get('general', 'private_dir') + "/SiteRM/background/" + workDir = self.config.get('general', 'privatedir') + "/SiteRM/background/" # get run ID; fname = workDir + f"/background-process-{self.inargs.runnum}.json" if not os.path.isfile(fname): diff --git a/packaging/siterm-site-fe/scripts/siterm-prompush b/packaging/siterm-site-fe/scripts/siterm-prompush index a6730403..af81503a 100644 --- a/packaging/siterm-site-fe/scripts/siterm-prompush +++ b/packaging/siterm-site-fe/scripts/siterm-prompush @@ -24,7 +24,7 @@ class MyDaemon(Daemon): def getThreads(self): """Multi threading. Allow multiple sites under single FE""" outThreads = {} - workDir = self.config.get('general', 'private_dir') + "/SiteRM/background/" + workDir = self.config.get('general', 'privatedir') + "/SiteRM/background/" # get run ID; fname = workDir + f"/background-process-{self.inargs.runnum}.json" if not os.path.isfile(fname): diff --git a/src/python/SiteFE/SNMPMonitoring/snmpmon.py b/src/python/SiteFE/SNMPMonitoring/snmpmon.py index 3f3191e7..973e37a2 100644 --- a/src/python/SiteFE/SNMPMonitoring/snmpmon.py +++ b/src/python/SiteFE/SNMPMonitoring/snmpmon.py @@ -167,7 +167,7 @@ def _promBackground(self, host): def _checkBackgroundProcesses(self, item): """Start Background work, like prometheus push""" - workDir = self.config.get('general', 'private_dir') + "/SiteRM/background/" + workDir = self.config.get('general', 'privatedir') + "/SiteRM/background/" createDirs(workDir) fname = workDir + f"/background-process-{item['id']}.json" if not os.path.isfile(fname): diff --git a/src/python/SiteRMAgent/Debugger/Debugger.py b/src/python/SiteRMAgent/Debugger/Debugger.py index 9653a365..50093562 100644 --- a/src/python/SiteRMAgent/Debugger/Debugger.py +++ b/src/python/SiteRMAgent/Debugger/Debugger.py @@ -75,7 +75,7 @@ def publishToFE(self, inDic): def _startbackgroundwork(self, item): """Start Background work, like prometheus push, arppush""" - workDir = self.config.get('general', 'private_dir') + "/SiteRM/background/" + workDir = self.config.get('general', 'privatedir') + "/SiteRM/background/" createDirs(workDir) fname = workDir + f"/background-process-{item['id']}.json" if not os.path.isfile(fname): diff --git a/src/python/SiteRMAgent/RecurringActions/DTNMain.py b/src/python/SiteRMAgent/RecurringActions/DTNMain.py index e9d34aaa..bf4574dc 100644 --- a/src/python/SiteRMAgent/RecurringActions/DTNMain.py +++ b/src/python/SiteRMAgent/RecurringActions/DTNMain.py @@ -85,7 +85,7 @@ def appendConfig(self, dic): def startwork(self): """Execute main script for SiteRM Agent output preparation.""" - workDir = self.config.get('general', 'private_dir') + "/SiteRM/" + workDir = self.config.get('general', 'privatedir') + "/SiteRM/" createDirs(workDir) dic, excMsg = self.prepareJsonOut() fullUrl = getFullUrl(self.config, self.sitename) diff --git a/src/python/SiteRMAgent/Ruler/Ruler.py b/src/python/SiteRMAgent/Ruler/Ruler.py index fb966e4f..66217320 100644 --- a/src/python/SiteRMAgent/Ruler/Ruler.py +++ b/src/python/SiteRMAgent/Ruler/Ruler.py @@ -27,7 +27,7 @@ class Ruler(contentDB, QOS, OverlapLib): def __init__(self, config, sitename): self.config = config if config else getGitConfig() self.logger = getLoggingObject(config=self.config, service='Ruler') - self.workDir = self.config.get('general', 'private_dir') + "/SiteRM/RulerAgent/" + self.workDir = self.config.get('general', 'privatedir') + "/SiteRM/RulerAgent/" createDirs(self.workDir) self.fullURL = getFullUrl(self.config, sitename) self.hostname = self.config.get('agent', 'hostname') diff --git a/src/python/SiteRMLibs/MainUtilities.py b/src/python/SiteRMLibs/MainUtilities.py index 06b6dca7..129f997a 100644 --- a/src/python/SiteRMLibs/MainUtilities.py +++ b/src/python/SiteRMLibs/MainUtilities.py @@ -308,7 +308,7 @@ def presetAgentDefaultConfigs(self): """Preset default config parameters for Agent""" defConfig = {'MAIN': {'general': {'logDir': '/var/log/siterm-agent/', 'logLevel': 'INFO', - 'private_dir': '/opt/siterm/config/'}, + 'privatedir': '/opt/siterm/config/'}, 'agent': {'norules': False, 'rsts_enabled': 'ipv4,ipv6'}, 'qos': {'policy': 'default-not-set', @@ -398,7 +398,7 @@ def presetFEDefaultConfigs(self): """Preset default config parameters for FE""" defConfig = {'MAIN': {'general': {'logDir': '/var/log/siterm-site-fe/', 'logLevel': 'INFO', - 'private_dir': '/opt/siterm/config/'}, + 'privatedir': '/opt/siterm/config/'}, 'ansible': {'private_data_dir': '/opt/siterm/config/ansible/sense/', 'inventory': '/opt/siterm/config/ansible/sense/inventory/inventory.yaml', 'rotate_artifacts': 100,