Jelajahi Sumber

kamctl: require db or ctl engine made specific for dispatcher subcommands

Daniel-Constantin Mierla 9 tahun lalu
induk
melakukan
d2416957e4
1 mengubah file dengan 5 tambahan dan 2 penghapusan
  1. 5 2
      utils/kamctl/kamctl

+ 5 - 2
utils/kamctl/kamctl

@@ -1583,15 +1583,15 @@ cr() {
 ### DISPATCHER management
 ### DISPATCHER management
 #
 #
 dispatcher() {
 dispatcher() {
-	require_dbengine
-	require_ctlengine
 	case $1 in
 	case $1 in
 		show)
 		show)
+			require_dbengine
 			mecho "dispatcher gateways"
 			mecho "dispatcher gateways"
 			QUERY="select * FROM $DISPATCHER_TABLE ORDER BY $DISPATCHER_SETID_COLUMN; "
 			QUERY="select * FROM $DISPATCHER_TABLE ORDER BY $DISPATCHER_SETID_COLUMN; "
 			$DBROCMD "$QUERY"
 			$DBROCMD "$QUERY"
 			;;
 			;;
 		addgw|add)
 		addgw|add)
+			require_dbengine
 			shift
 			shift
 			if [ $# -lt 2 ] ; then
 			if [ $# -lt 2 ] ; then
 				merr "too few parameters"
 				merr "too few parameters"
@@ -1638,6 +1638,7 @@ dispatcher() {
 
 
 			;;
 			;;
 		rmgw|rm)
 		rmgw|rm)
+			require_dbengine
 			shift
 			shift
 			if [ $# -ne 1 ] ; then
 			if [ $# -ne 1 ] ; then
 				merr "missing gateway id to be removed"
 				merr "missing gateway id to be removed"
@@ -1654,10 +1655,12 @@ dispatcher() {
 
 
 			;;
 			;;
 		reload)
 		reload)
+			require_ctlengine
 			$CTLCMD ds_reload
 			$CTLCMD ds_reload
 			;;
 			;;
 
 
 		dump)
 		dump)
+			require_ctlengine
 			$CTLCMD ds_list
 			$CTLCMD ds_list
 			;;
 			;;