commit 46528f78e5c(debian, rhel, xenserver: Ability to collect ovs-ctl logs)
made changes in the startup scripts such that the o/p of ovs-ctl is logged
into ovs-ctl.log. But it had an unintended consequence that the exit status
of ovs-ctl was no longer returned. We would always return success(the exit
status of tee).
With this commit, we return the exit status of ovs-ctl instead of tee.
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
utilities/ovs-lib.in | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 1684ddc..029ed3b 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -49,6 +49,14 @@ ovs_ctl () {
# pipe). So, do not log the o/p to ovs-ctl.log.
"${datadir}/scripts/ovs-ctl" "$@"
;;
+ "status")
+ # In case of the command 'status', we should return the exit status
+ # of ovs-ctl. It is also useful to document the o/p in ovs-ctl.log.
+ display=`"${datadir}/scripts/ovs-ctl" "$@" 2>&1`
+ rc=$?
+ echo "${display}" | tee -a "${logdir}/ovs-ctl.log"
+ return ${rc}
+ ;;
*)
echo "`date -u`:$@" >> "${logdir}/ovs-ctl.log"
"${datadir}/scripts/ovs-ctl" "$@" 2>&1 | tee -a
"${logdir}/ovs-ctl.log"
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
