[Cogkit-svn] SF.net SVN: cogkit: [1898] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/scheduler/submitQueue

[<ha...@us...>]

Revision: 1898
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1898&view=rev
Author:   hategan
Date:     2008-02-12 09:36:49 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
some logging updates

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java	2008-02-12 17:36:02 UTC (rev 1897)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java	2008-02-12 17:36:49 UTC (rev 1898)
@@ -35,7 +35,7 @@
 		if ("ssh".equalsIgnoreCase(provider)) {
 			sq = (SubmitQueue) providerQueues.get(provider.toLowerCase());
 			if (sq == null) {
-				sq = new RateLimiterQueue(initialRate, maxRetries, errorRegexp);
+				sq = new RateLimiterQueue(initialRate, maxRetries, errorRegexp, contact);
 				providerQueues.put(provider, sq);
 			}
 		}

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java	2008-02-12 17:36:02 UTC (rev 1897)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java	2008-02-12 17:36:49 UTC (rev 1898)
@@ -12,23 +12,30 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.apache.log4j.Logger;
 import org.globus.cog.abstraction.impl.common.StatusEvent;
 import org.globus.cog.abstraction.interfaces.Status;
 import org.globus.cog.abstraction.interfaces.StatusListener;
+import org.globus.cog.karajan.util.BoundContact;
 
 public class RateLimiterQueue extends AbstractSubmitQueue implements StatusListener {
+	public static final Logger logger = Logger.getLogger(RateLimiterQueue.class);
+
 	public static final int DEFAULT_MAX_RETRIES = 2;
 
 	private long lastSubmit, delay;
 	private static Timer timer;
 	private String errorRegexp;
 	private int maxRetries = DEFAULT_MAX_RETRIES;
+	private BoundContact contact;
 
-	public RateLimiterQueue(int initialRate, int maxRetries, String errorRegexp) {
+	public RateLimiterQueue(int initialRate, int maxRetries, String errorRegexp,
+			BoundContact contact) {
 		super(initialRate);
 		setRate(initialRate);
 		this.errorRegexp = errorRegexp;
 		this.maxRetries = maxRetries;
+		this.contact = contact;
 	}
 
 	public void setRate(int rate) {
@@ -96,7 +103,9 @@
 			if (getThrottle() > 2) {
 				setRate(getThrottle() - 1);
 			}
-			System.err.println("New rate: " + getThrottle() + " S/s");
+			if (logger.isDebugEnabled()) {
+				logger.debug("New rate for \"" + contact + "\": " + getThrottle() + " S/s");
+			}
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.