From 2306656f7382b5697f7e7f3259d089d3755dec6c Mon Sep 17 00:00:00 2001 From: Thorsten Schwander Date: Sun, 11 Jun 2023 17:27:28 -0600 Subject: [PATCH] fix server startup Signed-off-by: Thorsten Schwander --- phoebus-alarm-server/cli/commands/start-server | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/phoebus-alarm-server/cli/commands/start-server b/phoebus-alarm-server/cli/commands/start-server index eb326c1..09d6fa8 100644 --- a/phoebus-alarm-server/cli/commands/start-server +++ b/phoebus-alarm-server/cli/commands/start-server @@ -47,10 +47,8 @@ if [[ "$ALARM_IOC" = true ]]; then python3 /opt/nalms/scripts/update_ioc.py $CONFIG_NAME $KAFKA_BOOTSTRAP & fi -if java -jar $ALARM_SERVER_JAR -settings /tmp/alarm_server.properties -config $CONFIG_NAME -import $CONFIG_FILE; then - - java -jar $ALARM_SERVER_JAR -config $CONFIG_NAME -settings /tmp/alarm_server.properties -noshell -logging $LOGGING_CONFIG_FILE -xml_file $CONFIG_FILE - +if java -jar $ALARM_SERVER_JAR -config $CONFIG_NAME -settings /tmp/alarm_server.properties -noshell -logging $LOGGING_CONFIG_FILE -import $CONFIG_FILE; then + : else echo "Unable to import configuration." -fi \ No newline at end of file +fi