Move to Commons Base

[lgpl/argeo-commons.git] / osgi / dist / osgi-boot / src / main / rpm / usr / sbin / osgi-service

diff --git a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index c1f4528127d48ab843bd4bbd88f693541e4ef469..5c37f9c82f028dd9137559fc03a7fa6b111559ec 100644 (file)
--- a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -24,7 +24,7 @@ RUN_DIR=/var/run/$APP
 PID_FILE=$RUN_DIR/$APP.pid
 SHUTDOWN_FILE=$RUN_DIR/$APP.shutdown
 
-OSGI_INSTALL_AREA=/usr/share/osgiboot/lib
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
 RETVAL=0
@@ -48,15 +48,15 @@ start() {
        touch $SHUTDOWN_FILE
        cd $EXEC_DIR
        $JVM \
-               -Dosgi.bundles="org.argeo.osgi.boot.jar@start" \
-               -Dargeo.osgi.bundles="$CONF_DIR/modules;in=*,$LIB_DIR;in=*" \
                -Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
                -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
                $JAVA_OPTS -jar $OSGI_FRAMEWORK \
                -clean \
                -configuration "$CONF_RW" \
                -data "$DATA_DIR" \
-               &>> $LOG_FILE &
+               >> $LOG_FILE 2>&1 &
+       # (above) stderr redirected to stdout, then stdout to log file
+       # see http://tldp.org/LDP/abs/html/io-redirection.html
        PID=$!
        echo $PID > $PID_FILE
        #echo Started $APP with pid $PID
@@ -79,20 +79,43 @@ stop() {
                RETVAL=1
                return $RETVAL
        fi
+       
+       # notifies application by removing the shutdown file
        rm -f $SHUTDOWN_FILE
-       timeout 5m sh << EOF
-while kill -0 $PID &> /dev/null; do sleep 1; done
-EOF
-       TIMEOUT_EXIT=$?
-       if [ $TIMEOUT_EXIT -eq 124 ];then
-               kill -9 $PID
-               RETVAL=1
-               echo Killed $APP with pid $PID
-#      else
-#              echo Stopped $APP with pid $PID
-       fi
+       
+       # wait 5 min for application to shutdown, then kill it
+       TIMEOUT=$((5*60))
+       BEGIN=$(date +%s)
+       while kill -0 $PID &> /dev/null
+       do
+               sleep 1
+               NOW=$(date +%s)
+               DURATION=$(($NOW-$BEGIN))
+               if [ $DURATION -gt $TIMEOUT ]; then
+                       kill -9 $PID
+                       echo Forcibly killed $APP with pid $PID
+                       RETVAL=1
+               fi
+       done
+       
+       # remove pid file
        rm -f $PID_FILE
        return $RETVAL
+
+# timeout is only available in EL6
+#      timeout 5m sh << EOF
+#while kill -0 $PID &> /dev/null; do sleep 1; done
+#EOF
+#      TIMEOUT_EXIT=$?
+#      if [ $TIMEOUT_EXIT -eq 124 ];then
+#              kill -9 $PID
+#              RETVAL=1
+#              echo Killed $APP with pid $PID
+#      else
+#              echo Stopped $APP with pid $PID
+#      fi
+#      rm -f $PID_FILE
+#      return $RETVAL
 }
 
 status() {