Solve #665, Merge start-agent.sh into start-smart.sh

bin/common.sh

@@ -249,11 +249,19 @@ function init_command() {
       SMART_PID_FILE=/tmp/SmartServer.pid
       ALLOW_DAEMON_OPT=true
       SMART_VARGS+=" -format"
-      ;;
+      JAVA_OPTS+=" -Dsmart.log.file=SmartServer.log"
+    ;;
     smartserver)
       SMART_CLASSNAME=org.smartdata.server.SmartDaemon
       SMART_PID_FILE=/tmp/SmartServer.pid
       ALLOW_DAEMON_OPT=true
+      JAVA_OPTS+=" -Dsmart.log.file=SmartServer.log"
+    ;;
+    smartagent)
+      SMART_CLASSNAME=org.smartdata.agent.SmartAgent
+      SMART_PID_FILE=/tmp/SmartAgent.pid
+      ALLOW_DAEMON_OPT=true
+      JAVA_OPTS+=" -Dsmart.log.file=SmartAgent.log"
     ;;
     getconf)
       SMART_CLASSNAME=org.smartdata.server.utils.tools.GetConf

bin/smart

@@ -86,7 +86,6 @@ SMART_VARGS="$@"
 init_command ${COMMAND}
 
 JAVA_OPTS+=" -Dsmart.log.dir=${SMART_LOG_DIR}"
-JAVA_OPTS+=" -Dsmart.log.file=SmartServer.log"
 
 JAVA_VERSION=$($SMART_RUNNER -version 2>&1 | awk -F '.' '/version/ {print $2}')
 
@@ -98,6 +97,7 @@ fi
 
 addJarInDir "${SMART_HOME}/smart-server/target/lib"
 addNonTestJarInDir "${SMART_HOME}/smart-server/target"
+addNonTestJarInDir "${SMART_HOME}/smart-agent/target"
 addJarInDir "${SMART_HOME}/lib"
 
 if [ "$SMART_CLASSPATH" = "" ]; then
@@ -142,5 +142,6 @@ else
   else
     local_execute
   fi
+  exit $?
 fi
-exit $?
+

bin/start-smart.sh

@@ -56,7 +56,7 @@ done
 SMARTSERVERS=$("${SMART_HOME}/bin/smart" getconf SmartServers 2>/dev/null)
 
 if [ "$?" != "0" ]; then
-  echo "${SMARTSERVERS}"
+  echo "ERROR: Get SmartServers error: ${SMARTSERVERS}"
   exit 1
 fi
 
@@ -69,5 +69,24 @@ if [ x"${SMARTSERVERS}" != x"" ]; then
     --daemon start ${DEBUG_OPT} \
     smartserver
 else
-  echo "No SmartServers configured in 'hazelcast.xml'."
+  echo "WARN: No SmartServers configured in 'hazelcast.xml'."
+fi
+
+echo
+
+#---------------------------------------------------------
+# Start Smart Agents
+
+AGENTS_FILE="${SMART_CONF_DIR}/agents"
+if [ -f "${AGENTS_FILE}" ]; then
+  AGENT_HOSTS=$(sed 's/#.*$//;/^$/d' "${AGENTS_FILE}" | xargs echo)
+  if [ x"${AGENT_HOSTS}" != x"" ]; then
+    echo "Starting SmartAgents on [${AGENT_HOSTS}]"
+    . "${SMART_HOME}/bin/smart" \
+      --remote \
+      --config "${SMART_CONF_DIR}" \
+      --hosts "${AGENT_HOSTS}" --hostsend \
+      --daemon start ${DEBUG_OPT} \
+      smartagent
+  fi
 fi

bin/stop-smart.sh

@@ -52,8 +52,8 @@ done
 SMARTSERVERS=$("${SMART_HOME}/bin/smart" getconf SmartServers 2>/dev/null)
 
 if [ "$?" != "0" ]; then
-    echo "${SMARTSERVERS}"
-    exit 1
+  echo "ERROR: Get SmartServers error: ${SMARTSERVERS}"
+  exit 1
 fi
 
 if [ x"${SMARTSERVERS}" != x"" ]; then
@@ -67,3 +67,22 @@ if [ x"${SMARTSERVERS}" != x"" ]; then
 else
   echo "No SmartServers configured in 'hazelcast.xml'."
 fi
+
+echo
+
+#---------------------------------------------------------
+# Stop Smart Agents
+
+AGENTS_FILE="${SMART_CONF_DIR}/agents"
+if [ -f "${AGENTS_FILE}" ]; then
+  AGENT_HOSTS=$(sed 's/#.*$//;/^$/d' "${AGENTS_FILE}" | xargs echo)
+  if [ x"${AGENT_HOSTS}" != x"" ]; then
+    echo "Stopping SmartAgents on [${AGENT_HOSTS}]"
+    . "${SMART_HOME}/bin/smart" \
+      --remote \
+      --config "${SMART_CONF_DIR}" \
+      --hosts "${AGENT_HOSTS}" --hostsend \
+      --daemon stop ${DEBUG_OPT} \
+      smartagent
+  fi
+fi