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. Related-To: https://bugzilla.redhat.com/1030834 Change-Id: I1391b11225e69c98ff843d13db7ef517ec6534b3 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/dbutils/fkvalidator.sh M packaging/setup/dbutils/validatedb.sh M packaging/setup/plugins/ovirt-engine-setup/upgrade/asynctasks.py M packaging/setup/plugins/ovirt-engine-setup/upgrade/dbvalidations.py 4 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/24121/1 diff --git a/packaging/setup/dbutils/fkvalidator.sh b/packaging/setup/dbutils/fkvalidator.sh index caedf0f..23ec665 100755 --- a/packaging/setup/dbutils/fkvalidator.sh +++ b/packaging/setup/dbutils/fkvalidator.sh @@ -69,7 +69,7 @@ CMD="copy (select fk_violation,fk_status from fn_db_validate_fks(false,false) where fk_status=1) to stdout with csv;" fi fi - res="$(psql -w --pset=tuples_only=on --set ON_ERROR_STOP=1 -U ${USERNAME} -c "${CMD}" -h "${SERVERNAME}" -p "${PORT}" -L ${LOGFILE} "${DATABASE}")" + res="$(psql -w --pset=tuples_only=on --set ON_ERROR_STOP=1 -U ${USERNAME} -c "${CMD}" -h "${SERVERNAME}" -p "${PORT}" -L "${LOGFILE}" "${DATABASE}")" exit_code=$? out="$(echo "${res}" | cut -f1 -d,)" diff --git a/packaging/setup/dbutils/validatedb.sh b/packaging/setup/dbutils/validatedb.sh index 8662e94..fbfcd87 100755 --- a/packaging/setup/dbutils/validatedb.sh +++ b/packaging/setup/dbutils/validatedb.sh @@ -31,6 +31,7 @@ shift case "${x}" in --log=*) + LOGFILE="${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:+-l "$LOGFILE"} -q ${extra_params} || error=1 done exit ${error} diff --git a/packaging/setup/plugins/ovirt-engine-setup/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/upgrade/asynctasks.py index 3ed0ef8..0271319 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/upgrade/asynctasks.py @@ -24,6 +24,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 from otopi import base @@ -123,6 +124,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/upgrade/dbvalidations.py b/packaging/setup/plugins/ovirt-engine-setup/upgrade/dbvalidations.py index cbb9908..d5a273b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/upgrade/dbvalidations.py +++ b/packaging/setup/plugins/ovirt-engine-setup/upgrade/dbvalidations.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 @@ -58,6 +59,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/24121 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1391b11225e69c98ff843d13db7ef517ec6534b3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
