graylogctl (graylog-3.3.8.tgz) | : | graylogctl (graylog-4.0.0.tgz) | ||
---|---|---|---|---|
skipping to change at line 54 | skipping to change at line 54 | |||
fi | fi | |||
done | done | |||
# take variables from environment if set | # take variables from environment if set | |||
GRAYLOGCTL_DIR=${GRAYLOGCTL_DIR:=$(dirname "$GRAYLOGCTL")} | GRAYLOGCTL_DIR=${GRAYLOGCTL_DIR:=$(dirname "$GRAYLOGCTL")} | |||
GRAYLOG_SERVER_JAR=${GRAYLOG_SERVER_JAR:=graylog.jar} | GRAYLOG_SERVER_JAR=${GRAYLOG_SERVER_JAR:=graylog.jar} | |||
GRAYLOG_CONF=${GRAYLOG_CONF:=/etc/graylog/server/server.conf} | GRAYLOG_CONF=${GRAYLOG_CONF:=/etc/graylog/server/server.conf} | |||
GRAYLOG_PID=${GRAYLOG_PID:=/tmp/graylog.pid} | GRAYLOG_PID=${GRAYLOG_PID:=/tmp/graylog.pid} | |||
LOG_FILE=${LOG_FILE:=log/graylog-server.log} | LOG_FILE=${LOG_FILE:=log/graylog-server.log} | |||
LOG4J=${LOG4J:=} | LOG4J=${LOG4J:=} | |||
DEFAULT_JAVA_OPTS="-Djava.library.path=${GRAYLOGCTL_DIR}/../lib/sigar -Xms1g -Xm x1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcu rrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow" | DEFAULT_JAVA_OPTS="-Djava.library.path=${GRAYLOGCTL_DIR}/../lib/sigar -Djdk.tls. acknowledgeCloseNotify=true -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabl ed -XX:-OmitStackTraceInFastThrow" | |||
if $JAVA_CMD -XX:+PrintFlagsFinal 2>&1 |grep -q UseParNewGC; then | if $JAVA_CMD -XX:+PrintFlagsFinal 2>&1 |grep -q UseParNewGC; then | |||
DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} -XX:+UseParNewGC" | DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} -XX:+UseParNewGC" | |||
fi | fi | |||
JAVA_OPTS="${JAVA_OPTS:="$DEFAULT_JAVA_OPTS"}" | JAVA_OPTS="${JAVA_OPTS:="$DEFAULT_JAVA_OPTS"}" | |||
start() { | start() { | |||
echo "Starting graylog-server ..." | echo "Starting graylog-server ..." | |||
cd "$GRAYLOGCTL_DIR/.." | cd "$GRAYLOGCTL_DIR/.." | |||
"${NOHUP}" "${JAVA_CMD}" ${JAVA_OPTS} ${LOG4J} -jar "${GRAYLOG_SERVER_JAR}" server -f "${GRAYLOG_CONF}" -p "${GRAYLOG_PID}" >> "${LOG_FILE}" 2>> "${LOG_FILE }" & | "${NOHUP}" "${JAVA_CMD}" ${JAVA_OPTS} ${LOG4J} -jar "${GRAYLOG_SERVER_JAR}" server -f "${GRAYLOG_CONF}" -p "${GRAYLOG_PID}" >> "${LOG_FILE}" 2>> "${LOG_FILE }" & | |||
} | } | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |