Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Move logs out of /usr ......................................................................
packaging: setup: Move logs out of /usr Move logging of fkvalidator.sh and taskcleaner.sh to the setup log file. Change-Id: I1391b11225e69c98ff843d13db7ef517ec6534b3 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/dbutils/validatedb.sh M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/23794/1 diff --git a/packaging/setup/dbutils/validatedb.sh b/packaging/setup/dbutils/validatedb.sh index 8662e94..8370b0b 100755 --- a/packaging/setup/dbutils/validatedb.sh +++ b/packaging/setup/dbutils/validatedb.sh @@ -31,6 +31,7 @@ shift case "${x}" in --log=*) + LOGFILE="-l ${v}" ;; --user=*) USERNAME="-u ${v}" @@ -60,6 +61,6 @@ validationlist="fkvalidator.sh" for script in ${validationlist}; do - $dbutils/${script} ${USERNAME} ${SERVERNAME} ${PORT} ${DATABASE} -q ${extra_params} || error=1 + $dbutils/${script} ${USERNAME} ${SERVERNAME} ${PORT} ${DATABASE} ${LOGFILE} -q ${extra_params} || error=1 done exit ${error} diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py index 0897f17..4159d60 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py @@ -123,6 +123,7 @@ rc, tasks, stderr = self.execute( args=( osetupcons.FileLocations.OVIRT_ENGINE_TASKCLEANER, + '-l', self.environment[otopicons.CoreEnv.LOG_FILE_NAME], '-u', self.environment[osetupcons.DBEnv.USER], '-s', self.environment[osetupcons.DBEnv.HOST], '-p', str(self.environment[osetupcons.DBEnv.PORT]), diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py index ded9e03..9db1ec8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py @@ -58,6 +58,11 @@ osetupcons.DBEnv.DATABASE ], ), + '--log={logfile}'.format( + logfile=self.environment[ + otopicons.CoreEnv.LOG_FILE_NAME + ], + ), ] if fix: args.append('--fix') -- To view, visit http://gerrit.ovirt.org/23794 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1391b11225e69c98ff843d13db7ef517ec6534b3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
