Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: do not use /var/tmp for reportsd ......................................................................
packaging: do not use /var/tmp for reportsd /var/tmp is intended for temporary files. reportsd is a long-running process, and should not keep its files there. Use /var/lib/ovirt-engine-reports/jboss_runtime instead. Change-Id: Icc5c730d8944ec686f6025dbacc6cc5118c9b180 Signed-off-by: Yedidyah Bar David <[email protected]> --- M Makefile M packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf.in M packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py M packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.xml.in 4 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/52/29752/1 diff --git a/Makefile b/Makefile index 6e6dc7b..2226790 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ ENGINE_STATE_DIR=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME) PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/ovirt-engine-reports JBOSS_HOME=/usr/share/jboss-as +JBOSS_RUNTIME=$(PKG_STATE_DIR)/jboss_runtime PYTHON_DIR=$(PYTHON_SYS_DIR) DEV_PYTHON_DIR= PKG_USER=ovirt @@ -100,6 +101,7 @@ -e "s|@DISPLAY_VERSION@|$(DISPLAY_VERSION)|g" \ -e "s|@ENGINE_VAR@|$(ENGINE_STATE_DIR)|g" \ -e "s|@JBOSS_HOME@|$(JBOSS_HOME)|g" \ + -e "s|@JBOSS_RUNTIME@|$(JBOSS_RUNTIME)|g" \ -e "s|@PEP8@|$(PEP8)|g" \ -e "s|@PYFLAKES@|$(PYFLAKES)|g" \ $< > $@ diff --git a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf.in b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf.in index 7aea91a..eb49aa8 100644 --- a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf.in +++ b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf.in @@ -16,6 +16,7 @@ # The location of the application server: # JBOSS_HOME="@JBOSS_HOME@" +JBOSS_RUNTIME="@JBOSS_RUNTIME@" # # Important directories: diff --git a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py index 06853ba..79f5fb6 100755 --- a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py +++ b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py @@ -39,6 +39,7 @@ def __init__(self): super(Daemon, self).__init__() self._tempDir = None + self._jbossRuntime = None self._defaults = os.path.abspath( os.path.join( os.path.dirname(sys.argv[0]), @@ -61,7 +62,7 @@ searchList=[ self._config, { - 'tempdir': self._tempDir.directory, + 'jboss_runtime': self._jbossRuntime.directory, }, ], ) @@ -159,7 +160,7 @@ def _setupApps(self): deploymentsDir = os.path.join( - self._tempDir.directory, + self._jbossRuntime.directory, 'deployments', ) os.mkdir(deploymentsDir) @@ -237,21 +238,24 @@ self._tempDir = service.TempDir(self._config.get('PKG_TMP_DIR')) self._tempDir.create() + self._jbossRuntime = service.TempDir(self._config.get('JBOSS_RUNTIME')) + self._jbossRuntime.create() + self._setupApps() jbossTempDir = os.path.join( - self._tempDir.directory, + self._jbossRuntime.directory, 'tmp', ) jbossConfigDir = os.path.join( - self._tempDir.directory, + self._jbossRuntime.directory, 'config', ) javaModulePath = self._linkModules( os.path.join( - self._tempDir.directory, + self._jbossRuntime.directory, 'modules', ), '%s:%s' % ( @@ -422,6 +426,8 @@ def daemonCleanup(self): if self._tempDir: self._tempDir.destroy() + if self._jbossRuntime: + self._jbossRuntime.destroy() if __name__ == '__main__': diff --git a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.xml.in b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.xml.in index 5986b92..59c2ec3 100644 --- a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.xml.in +++ b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.xml.in @@ -144,7 +144,7 @@ </subsystem> <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1"> - <deployment-scanner scan-interval="5000" path="$tempdir/deployments" deployment-timeout="1200"/> + <deployment-scanner scan-interval="5000" path="$jboss_runtime/deployments" deployment-timeout="1200"/> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> -- To view, visit http://gerrit.ovirt.org/29752 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc5c730d8944ec686f6025dbacc6cc5118c9b180 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
