perfsonar development work

Author: gijs
Date: 2008-04-08 07:30:21 -0400 (Tue, 08 Apr 2008)
New Revision: 3628

Modified:
   trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc
Log:
fixed some bugs

Modified: trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc
===================================================================
--- trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc       2008-04-08 
10:08:07 UTC (rev 3627)
+++ trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc       2008-04-08 
11:30:21 UTC (rev 3628)
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Start/stop the perfsonar flowsa-ma nfcapd collectors.
+#
 # $Id$
 # $Revision$
 
@@ -7,13 +8,13 @@
 # Provides:          PERFsonar flow SA MA nfcapd
 # Short-Description: PERFsonar flow selection and aggregation MA nfcapd flow 
collector 
 # Description:       This script will start the necessary nfcapd processes 
for
-#                    the flowsa-ma. this script will get the router config 
from the
-#                    service.properties file of the flow-sa-ma tomcat 
service,
-#                    so you need to edit this file first.
+#                    the perfsonar flowsa-ma service. this script will get 
the
+#                    router config from the service.properties file of the
+#                    flow-sa-ma tomcat service, so you need to edit this file
+#                    first.
 ### END INIT INFO
 
 ### BEGIN SCRIPT CONFIG
-# TODO: this should be moved to /etc/sysconfig
 #
 ## where is the service.properties file located
 
CONF=/var/lib/tomcat5/webapps/flowsa-ma/WEB-INF/classes/perfsonar/conf/service.properties
@@ -21,10 +22,10 @@
 ### END SCRIPT CONFIG
 
 # source function library
-. /etc/rc.d/init.d/functions
+[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
 
 # source lsb function library
-. /lib/lsb/init-functions
+[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 
 # pull in sysconfig settings
 [ -f /etc/sysconfig/flowsa-nfcapd ] && . /etc/sysconfig/flowsa-nfcapd
@@ -105,9 +106,9 @@
 
                # check if we should run as differnt user
                if [[ -z $USER ]]; then
-                       COMMAND="$NFCAPD -p $PORT -w -t 300 -D -l 
$STORAGE/$HOST -I $HOST -P $PIDFILE"
+                       COMMAND="$NFCAPD -e -p $PORT -w -t 300 -D -l 
$STORAGE/$HOST -I $HOST -P $PIDFILE"
                else
-                       COMMAND="$NFCAPD -p $PORT -u $USER en -g $GROUP -w -t 
300 -D -l $STORAGE/$HOST -I $HOST -P $PIDFILE"
+                       COMMAND="$NFCAPD -e -p $PORT -u $USER -g $GROUP -w -t 
300 -D -l $STORAGE/$HOST -I $HOST -P $PIDFILE"
                fi
 
                # finally run the command