Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: set ovirt-engine-remove prefix for remove log ......................................................................
packaging: setup: set ovirt-engine-remove prefix for remove log Change-Id: I7f337f0912acc7e13552628edf50e150c7ec3227 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-common/core/misc.py M packaging/setup/plugins/ovirt-engine-remove/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/core/misc.py 4 files changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/15067/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 11c8e29..e650b02 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -83,6 +83,7 @@ ) OVIRT_OVIRT_SETUP_LOG_PREFIX = 'ovirt-engine-setup' + OVIRT_OVIRT_REMOVE_LOG_PREFIX = 'ovirt-engine-remove' OVIRT_IPTABLES_EXAMPLE = os.path.join( OVIRT_ENGINE_SYSCONFDIR, diff --git a/packaging/setup/plugins/ovirt-engine-common/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/core/misc.py index ebf9449..4c59b26 100644 --- a/packaging/setup/plugins/ovirt-engine-common/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/core/misc.py @@ -43,15 +43,10 @@ @plugin.event( stage=plugin.Stages.STAGE_BOOT, before=[ - otopicons.Stages.CORE_LOG_INIT, otopicons.Stages.CORE_CONFIG_INIT, ], ) def _preinit(self): - self.environment.setdefault( - otopicons.CoreEnv.LOG_FILE_NAME_PREFIX, - osetupcons.FileLocations.OVIRT_OVIRT_SETUP_LOG_PREFIX - ) self.environment.setdefault( otopicons.CoreEnv.CONFIG_FILE_NAME, self.resolveFile( diff --git a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py index 2131fb8..3c0d7db 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/core/misc.py @@ -23,6 +23,7 @@ _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') +from otopi import constants as otopicons from otopi import util from otopi import plugin @@ -39,6 +40,18 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_BOOT, + before=[ + otopicons.Stages.CORE_LOG_INIT, + ], + ) + def _preinit(self): + self.environment.setdefault( + otopicons.CoreEnv.LOG_FILE_NAME_PREFIX, + osetupcons.FileLocations.OVIRT_OVIRT_REMOVE_LOG_PREFIX + ) + + @plugin.event( stage=plugin.Stages.STAGE_INIT, ) def _init(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py index 58a0d8f..d5dfb07 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py @@ -23,6 +23,7 @@ _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') +from otopi import constants as otopicons from otopi import util from otopi import plugin @@ -38,6 +39,18 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_BOOT, + before=[ + otopicons.Stages.CORE_LOG_INIT, + ], + ) + def _preinit(self): + self.environment.setdefault( + otopicons.CoreEnv.LOG_FILE_NAME_PREFIX, + osetupcons.FileLocations.OVIRT_OVIRT_SETUP_LOG_PREFIX + ) + + @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, name=osetupcons.Stages.CORE_ENGINE_START, condition=lambda self: not self.environment[ -- To view, visit http://gerrit.ovirt.org/15067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f337f0912acc7e13552628edf50e150c7ec3227 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
