docker-cs: fix cloudstack-usage

weizhouapache · weizhouapache · commit 6006f08fbbb4 · 2023-05-13T19:01:36.000Z
diff --git a/bin/cloudstack-management b/bin/cloudstack-management
@@ -13,7 +13,7 @@ find_pids() {
 }
 
 stop_pid() {
-    pids=$1
+    pids=$*
     for pid in $pids;do
         kill $pid
     done
@@ -26,7 +26,7 @@ start_management() {
 
 start_usage() {
     source /etc/default/cloudstack-usage
-    tini -- /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &
+    /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &
 }
 
 start_service() {
diff --git a/bin/cloudstack-usage b/bin/cloudstack-usage
@@ -13,7 +13,7 @@ find_pids() {
 }
 
 stop_pid() {
-    pids=$1
+    pids=$*
     for pid in $pids;do
         kill $pid
     done
@@ -26,7 +26,7 @@ start_management() {
 
 start_usage() {
     source /etc/default/cloudstack-usage
-    tini -- /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &
+    /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &
 }
 
 start_service() {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ find_pids() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`stop_pid() {`
`16`		`- pids=$1`
	`16`	`+ pids=$*`
`17`	`17`	`for pid in $pids;do`
`18`	`18`	`kill $pid`
`19`	`19`	`done`
`@@ -26,7 +26,7 @@ start_management() {`
`26`	`26`
`27`	`27`	`start_usage() {`
`28`	`28`	`source /etc/default/cloudstack-usage`
`29`		`- tini -- /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &`
	`29`	`+ /usr/bin/java -Dpid=$$ $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS > /dev/null 2>&1 &`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`start_service() {`