perfsonar development work

Author: michael.bischoff
Date: 2008-10-07 02:54:03 -0400 (Tue, 07 Oct 2008)
New Revision: 4591

Modified:
   trunk/ps-mdm-flowsub-mp/conf/service.properties
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
Log:
- Fixed wrong default configuration.
- Added check for zebedee executable not found.

Modified: trunk/ps-mdm-flowsub-mp/conf/service.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-10-02 13:47:57 
UTC (rev 4590)
+++ trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-10-07 06:54:03 
UTC (rev 4591)
@@ -131,7 +131,7 @@
 
 # Group=Applications
 # Description= Zebedee for tunnels
-service.mp.flow.zebedee=/usr/bin/zebedee798079
+service.mp.flow.zebedee=/usr/bin/zebedee
 
 # Group=Applications
 # Description=nfdump for reading nfcapd files

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
   2008-10-02 13:47:57 UTC (rev 4590)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
   2008-10-07 06:54:03 UTC (rev 4591)
@@ -1,11 +1,13 @@
 package org.perfsonar.service.measurementPoint.flowsubscription;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.base.auxiliary.ComponentNames;
 import 
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
 import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.exceptions.PerfSONARException;
 
 /**
  * Controls a list of active zebedee tunnels, with keepalive feature.
@@ -43,6 +45,10 @@
                        logger.debug("Creating zebedee controll");
                        
                        zebedeeExecutable = 
configuration.getProperty("service.mp.flow.zebedee");
+
+                       if(!new File(zebedeeExecutable).canExecute()) {
+                               throw new 
PerfSONARException("error.ma.configuration","Zebedee executable doesn't exist 
or the program is not allow to execute it.");
+                       }
                } catch (Exception e) {
                        //fail fast with a runtime exception
                        throw new RuntimeException(e);
@@ -74,7 +80,7 @@
         * @param clientIP
         *            The flow subscribers ip address.
         * @param outPort
-        *            The port on wich the client wants to receive the flows. 
This
+        *            The port on which the client wants to receive the 
flows. This
         *            port is supplied by the subscriber.
         * @param serverTunnelPort 
         * @return a ZedebeeTunnel