Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: produce and manage setup logs at /var/log
......................................................................
packaging: setup: produce and manage setup logs at /var/log
although setup logs are not of daemon, they used to be stored at
/var/log for future reference.
the location of the logs was changed, to improve
/var/log/ovirt-engine sanity.
/var/log/ovirt-engine -> /var/log/ovirt-engine/setup
A log rotation was introduced in order to compress old logs.
Change-Id: I2b676ce4dd92e450086b16b4311a981b9071060e
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M Makefile
M ovirt-engine.spec.in
M packaging/setup/ovirt_engine_setup/config.py.in
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-remove/core/misc.py
M packaging/setup/plugins/ovirt-engine-setup/core/misc.py
A packaging/sys-etc/logrotate.d/ovirt-engine-setup.in
7 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/17284/1
diff --git a/Makefile b/Makefile
index 14833f7..98bdac5 100644
--- a/Makefile
+++ b/Makefile
@@ -161,6 +161,7 @@
packaging/etc/notifier/log4j.xml \
packaging/sys-etc/logrotate.d/ovirt-engine \
packaging/sys-etc/logrotate.d/ovirt-engine-notifier \
+ packaging/sys-etc/logrotate.d/ovirt-engine-setup \
packaging/services/ovirt-engine-notifier/config.py \
packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf \
packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.systemd \
@@ -448,5 +449,6 @@
install -d "$(DESTDIR)$(PKG_STATE_DIR)/deployments"
install -d "$(DESTDIR)$(PKG_STATE_DIR)/content"
install -d "$(DESTDIR)$(PKG_LOG_DIR)/host-deploy"
+ install -d "$(DESTDIR)$(PKG_LOG_DIR)/setup"
install -d "$(DESTDIR)$(PKG_LOG_DIR)/notifier"
install -d "$(DESTDIR)$(PKG_LOG_DIR)/engine-manage-domains"
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 9ee3a9e..9ede961 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -252,6 +252,7 @@
Group: Virtualization/Management
Requires: %{name}
Requires: %{name}-lib
+Requires: logrotate
Requires: libselinux-python
Requires: libxml2-python
Requires: lsof
@@ -426,7 +427,7 @@
install -dm 755 %{buildroot}/%{engine_state}/deployments
install -dm 755 %{buildroot}/%{engine_state}/content
-install -dm 755
%{buildroot}/%{engine_log}/{host-deploy,notifier,engine-manage-domains}
+install -dm 755
%{buildroot}/%{engine_log}/{host-deploy,setup,notifier,engine-manage-domains}
install -dm 755 %{buildroot}/%{engine_cache}
install -dm 755 %{buildroot}/%{engine_run}/notifier
@@ -780,7 +781,9 @@
%files setup
+%config %{_sysconfdir}/logrotate.d/ovirt-engine-setup
%config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging.conf
+%{engine_log}/setup
# Links to the main programs:
%{_bindir}/engine-setup
diff --git a/packaging/setup/ovirt_engine_setup/config.py.in
b/packaging/setup/ovirt_engine_setup/config.py.in
index 210f215..8fef77e 100644
--- a/packaging/setup/ovirt_engine_setup/config.py.in
+++ b/packaging/setup/ovirt_engine_setup/config.py.in
@@ -28,6 +28,7 @@
ENGINE_DATADIR = '@ENGINE_USR@'
ENGINE_LOCALSTATEDIR = '@ENGINE_VAR@'
ENGINE_TMP = '@ENGINE_TMP@'
+ENGINE_LOG = '@ENGINE_LOG@'
PACKAGE_NAME = '@PACKAGE_NAME@'
PACKAGE_VERSION = '@PACKAGE_VERSION@'
DISPLAY_VERSION = '@DISPLAY_VERSION@'
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index 06559be..993f379 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -71,6 +71,7 @@
OVIRT_ENGINE_DATADIR = config.ENGINE_DATADIR
OVIRT_ENGINE_LOCALSTATEDIR = config.ENGINE_LOCALSTATEDIR
OVIRT_ENGINE_TMPDIR = config.ENGINE_TMP
+ OVIRT_ENGINE_LOGDIR = config.ENGINE_LOG
OVIRT_ENGINE_SERVICE_CONFIG = config.ENGINE_SERVICE_CONFIG
OVIRT_ENGINE_WEBSOCKET_PROXY_CONFIG = config.ENGINE_WEBSOCKET_PROXY_CONFIG
OVIRT_ENGINE_NOTIFIER_SERVICE_CONFIG = \
@@ -83,6 +84,10 @@
OVIRT_OVIRT_SETUP_CONFIG_FILE = config.ENGINE_SETUP_CONFIG
+ OVIRT_SETUP_LOGDIR = os.path.join(
+ OVIRT_ENGINE_LOGDIR,
+ 'setup',
+ )
OVIRT_OVIRT_SETUP_LOG_PREFIX = 'ovirt-engine-setup'
OVIRT_OVIRT_REMOVE_LOG_PREFIX = 'ovirt-engine-remove'
diff --git a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
index 416d940..8f94f3c 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py
@@ -47,6 +47,10 @@
)
def _preinit(self):
self.environment.setdefault(
+ otopicons.CoreEnv.LOG_DIR,
+ osetupcons.FileLocations.OVIRT_SETUP_LOGDIR
+ )
+ self.environment.setdefault(
otopicons.CoreEnv.LOG_FILE_NAME_PREFIX,
osetupcons.FileLocations.OVIRT_OVIRT_REMOVE_LOG_PREFIX
)
diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py
b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py
index a570581..519940f 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py
@@ -47,6 +47,10 @@
)
def _preinit(self):
self.environment.setdefault(
+ otopicons.CoreEnv.LOG_DIR,
+ osetupcons.FileLocations.OVIRT_SETUP_LOGDIR
+ )
+ self.environment.setdefault(
otopicons.CoreEnv.LOG_FILE_NAME_PREFIX,
osetupcons.FileLocations.OVIRT_OVIRT_SETUP_LOG_PREFIX
)
diff --git a/packaging/sys-etc/logrotate.d/ovirt-engine-setup.in
b/packaging/sys-etc/logrotate.d/ovirt-engine-setup.in
new file mode 100644
index 0000000..02e2c4f4
--- /dev/null
+++ b/packaging/sys-etc/logrotate.d/ovirt-engine-setup.in
@@ -0,0 +1,7 @@
+"@ENGINE_LOG@/setup/*.log {
+ monthly
+ missingok
+ compress
+ nocreate
+ rotate 1
+}
--
To view, visit http://gerrit.ovirt.org/17284
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b676ce4dd92e450086b16b4311a981b9071060e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
