yuanzac commented on a change in pull request #93: SUBMARINE-292. Merge
workbench server into submarine server
URL: https://github.com/apache/submarine/pull/93#discussion_r347183006
##########
File path: bin/submarine-daemon.sh
##########
@@ -111,53 +110,53 @@ function check_jdbc_jar() {
function start() {
local pid
- pid=`found_workbench_server_pid`
+ pid=`found_submarine_server_server_pid`
if [[ ! -z "$pid" && "$pid" != 0 ]]; then
- echo "${WORKBENCH_NAME}:${pid} is already running"
+ echo "${SUBMARINE_SERVER_NAME}:${pid} is already running"
return 0;
fi
- check_jdbc_jar "${BIN}/../workbench/lib"
-
+ check_jdbc_jar "${BIN}/../lib"
+
initialize_default_directories
- echo "WORKBENCH_CLASSPATH: ${WORKBENCH_CLASSPATH}" >> "${WORKBENCH_LOGFILE}"
+ echo "SUBMARINE_SERVER_CLASSPATH: ${SUBMARINE_SERVER_CLASSPATH}" >>
"${SUBMARINE_SERVER_LOGFILE}"
- nohup $JAVA_RUNNER $JAVA_OPTS -cp $WORKBENCH_CLASSPATH $WORKBENCH_MAIN >>
"${WORKBENCH_LOGFILE}" 2>&1 < /dev/null &
+ nohup $JAVA_RUNNER $JAVA_OPTS -cp $SUBMARINE_SERVER_CLASSPATH
$SUBMARINE_SERVER_MAIN >> "${SUBMARINE_SERVER_LOGFILE}" 2>&1 < /dev/null &
pid=$!
if [[ ! -z "${pid}" ]]; then
- echo "${WORKBENCH_NAME} start"
+ echo "${SUBMARINE_SERVER_NAME} start"
return 1;
fi
}
function stop() {
local pid
- pid=`found_workbench_server_pid`
+ pid=`found_submarine_server_server_pid`
Review comment:
Is it better to use found_submarine_server_pid?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]