perfsonar-dev - perfsonar: r3929 - in trunk/surfnet_java-flowsubscription-mp: conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementPoint/flowsubscription
Subject: perfsonar development work
List archive
perfsonar: r3929 - in trunk/surfnet_java-flowsubscription-mp: conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementPoint/flowsubscription
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3929 - in trunk/surfnet_java-flowsubscription-mp: conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementPoint/flowsubscription
- Date: Fri, 30 May 2008 11:49:01 -0400
Author: michael.bischoff
Date: 2008-05-30 11:49:00 -0400 (Fri, 30 May 2008)
New Revision: 3929
Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Subscription.java
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
Log:
Fix for ending subscription not working
Improved logging
Modified: trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
2008-05-30 14:43:44 UTC (rev 3928)
+++ trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
2008-05-30 15:49:00 UTC (rev 3929)
@@ -12,7 +12,7 @@
<init-param>
<param-name>ips</param-name>
<param-value>
- 127.0.0.1 62.131.17.150 78.27.8.39
192.87.102.* 192.87.109.* 192.87.117.* 2001:610:508:109:20b:dbff:fee9:61f3
+ 127.0.0.1 78.40.193.108 62.131.17.150
78.27.8.39 192.87.102.* 192.87.109.* 192.87.117.*
2001:610:508:109:20b:dbff:fee9:61f3
</param-value>
<description>
A space separated list of ips that are
allowed to access
Modified:
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
---
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
2008-05-30 14:43:44 UTC (rev 3928)
+++
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
2008-05-30 15:49:00 UTC (rev 3929)
@@ -236,19 +236,15 @@
Process proces = null;
Process pipeTarget = null;
try {
- try {
- String commands =
Arrays.toString(builder1.command().toArray());
- proces = builder1.start();
- if(builder2!=null) {
- pipeTarget = builder2.start();
- commands += " piped into " +
Arrays.toString(builder2.command().toArray());
- new
Pipe(proces,pipeTarget).call();
- }
- logger.debug("Executing replay: " +
commands);
- return
Integer.valueOf(proces.waitFor());
- } catch (IOException e) {
- logger.warn("Error relaying output");
- }
+ String commands =
Arrays.toString(builder1.command().toArray());
+ proces = builder1.start();
+ if(builder2!=null) {
+ pipeTarget = builder2.start();
+ commands += " piped into " +
Arrays.toString(builder2.command().toArray());
+ new Pipe(proces,pipeTarget).call();
+ }
+ logger.debug("Executing replay: " + commands);
+ return Integer.valueOf(proces.waitFor());
} finally {
if(proces != null) {
proces.destroy();
@@ -257,7 +253,6 @@
pipeTarget.destroy();
}
}
- return null;
}
}
Modified:
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Subscription.java
===================================================================
---
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Subscription.java
2008-05-30 14:43:44 UTC (rev 3928)
+++
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/Subscription.java
2008-05-30 15:49:00 UTC (rev 3929)
@@ -122,9 +122,10 @@
@Override
public boolean equals(Object obj) {
if(obj == null) return false;
+ if(this == obj) return true;
if (obj instanceof Subscription) {
Subscription subscription = (Subscription) obj;
- return id.intValue() == subscription.id.intValue();
+ return id.equals(subscription.id);
}
return false;
}
Modified:
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
===================================================================
---
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
2008-05-30 14:43:44 UTC (rev 3928)
+++
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
2008-05-30 15:49:00 UTC (rev 3929)
@@ -109,15 +109,19 @@
*/
public void end(Subscription subscription) {
if(subscription==null) {
- logger.warn("SubscriptionService.end() subscription =
null");
+ logger.warn("SubscriptionService#end() subscription =
null");
return;
}
+ logger.debug("SubscriptionService#end() Ending subscription
(id="+subscription.getId()+")");
+
if(!subscription.hasEnded()) {
subscription.end();
}
if(subscriptions.containsValue(subscription)) {
- subscriptions.remove(subscription);
- }
+ subscriptions.remove(subscription.getId());
+ } else {
+ logger.error("SubscriptionService#end() Subscription
("+subscription+") doesn't belong to this subscription service.");
+ }
}
public void keepSubscriptionAlive(Integer key) throws
PerfSONARException {
- perfsonar: r3929 - in trunk/surfnet_java-flowsubscription-mp: conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementPoint/flowsubscription, svnlog, 05/30/2008
Archive powered by MHonArc 2.6.16.