fix coordinator command-line call in packages

batfish · Jul 27, 2017 · b2980a4 · b2980a4
1 parent e4e4dd2
commit b2980a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tools/package_rpm.sh b/tools/package_rpm.sh
@@ -109,7 +109,7 @@ WantedBy=multi-user.target
 [Service]
 User=$BATFISH_USER
 Group=$BATFISH_USER
-ExecStart=/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH) -jar $COORDINATOR_JAR -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'
+ExecStart=/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH):$COORDINATOR_JAR $COORDINATOR_MAIN_CLASS -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'
 WorkingDirectory=$BATFISH_HOME
 PIDFile=$BATFISH_RUN_DIR/coordinator.pid
 Restart=always
@@ -201,7 +201,7 @@ start() {
       echo "Missing pid file, but lock file present: $COORDINATOR_LOCK" >&2
       return 1
    fi
-   su -c "bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH) -jar $COORDINATOR_JAR -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG & echo \\\$! > $COORDINATOR_PID_FILE'" batfish
+   su -c "bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH):$COORDINATOR_JAR $COORDINATOR_MAIN_CLASS -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG & echo \\\$! > $COORDINATOR_PID_FILE'" batfish
    touch $COORDINATOR_LOCK
    echo "Success"
 }
@@ -249,6 +249,7 @@ EOF
 
 package() {
    set -e
+   COORDINATOR_MAIN_CLASS=org.batfish.coordinator.Main
    BATFISH_TOOLS_PATH="$(readlink -f $(dirname $BATFISH_SOURCED_SCRIPT))"
    SCRIPT_NAME="$(basename $BATFISH_SOURCED_SCRIPT)"
    BATFISH_PATH="$(readlink -f ${BATFISH_TOOLS_PATH}/..)"

diff --git a/tools/package_ubuntu.sh b/tools/package_ubuntu.sh
@@ -95,7 +95,7 @@ WantedBy=multi-user.target
 [Service]
 User=$BATFISH_USER
 Group=$BATFISH_USER
-ExecStart=/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH) -jar $COORDINATOR_JAR -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'
+ExecStart=/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH):$COORDINATOR_JAR $COORDINATOR_MAIN_CLASS -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'
 WorkingDirectory=$BATFISH_HOME
 PIDFile=$BATFISH_RUN_DIR/coordinator.pid
 Restart=always
@@ -124,7 +124,7 @@ stop on runlevel [!2345]
 
 respawn
 
-exec su -c "/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH) -jar $COORDINATOR_JAR -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'" $BATFISH_USER
+exec su -c "/bin/bash -c '/usr/bin/java -DbatfishCoordinatorPropertiesPath=$COORDINATOR_PROPERTIES -cp \$(cat $COORDINATOR_CLASSPATH):$COORDINATOR_JAR $COORDINATOR_MAIN_CLASS -logfile $COORDINATOR_LOG -containerslocation $BATFISH_HOME &>> $COORDINATOR_JAVA_LOG'" $BATFISH_USER
 EOF
    echo $BATFISH_INIT >> $CONFFILES_FILE
    echo $COORDINATOR_INIT >> $CONFFILES_FILE
@@ -137,6 +137,7 @@ EOF
 
 package() {
    set -e
+   COORDINATOR_MAIN_CLASS=org.batfish.coordinator.Main
    BATFISH_TOOLS_PATH="$(readlink -f $(dirname $BATFISH_SOURCED_SCRIPT))"
    SCRIPT_NAME="$(basename $BATFISH_SOURCED_SCRIPT)"
    BATFISH_PATH="$(readlink -f ${BATFISH_TOOLS_PATH}/..)"