[Swift-commit] r3282 - in trunk: etc libexec src/org/globus/swift/data

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-04-12 09:55:42 -0500 (Mon, 12 Apr 2010)
New Revision: 3282

Modified:
   trunk/etc/log4j.properties
   trunk/libexec/vdl-int.k
   trunk/src/org/globus/swift/data/Action.java
   trunk/src/org/globus/swift/data/Query.java
Log:
Clean up debugging output. 


Modified: trunk/etc/log4j.properties
===================================================================
--- trunk/etc/log4j.properties	2010-04-11 21:50:14 UTC (rev 3281)
+++ trunk/etc/log4j.properties	2010-04-12 14:55:42 UTC (rev 3282)
@@ -28,5 +28,5 @@
 log4j.logger.org.griphyn.vdl.engine.Karajan=INFO
 log4j.logger.org.globus.cog.abstraction.coaster.rlog=INFO
 
-log4j.logger.org.globus.swift.data.Director=DEBUG
+# log4j.logger.org.globus.swift.data.Director=DEBUG
 log4j.logger.org.griphyn.vdl.karajan.lib=INFO

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2010-04-11 21:50:14 UTC (rev 3281)
+++ trunk/libexec/vdl-int.k	2010-04-12 14:55:42 UTC (rev 3282)
@@ -319,7 +319,6 @@
                                         "desthost={desthost} destdir={destdir} provider={provider}")
 			)
 			cdm:wait()
-			echo("doStageinFile: complete: {srcfile}")
  	        )
 
 		element(doStageout, [jobid, stageouts, dir, host]

Modified: trunk/src/org/globus/swift/data/Action.java
===================================================================
--- trunk/src/org/globus/swift/data/Action.java	2010-04-11 21:50:14 UTC (rev 3281)
+++ trunk/src/org/globus/swift/data/Action.java	2010-04-12 14:55:42 UTC (rev 3282)
@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import org.apache.log4j.Logger;
+
 import org.globus.cog.karajan.arguments.Arg;
 import org.globus.cog.karajan.stack.VariableStack;
 import org.globus.cog.karajan.workflow.ExecutionException;
@@ -13,7 +15,8 @@
  * Karajan-accessible CDM functions that change something.
  * */
 public class Action extends FunctionsCollection {
-
+    private static final Logger logger = Logger.getLogger(Action.class);
+    
     public static final Arg PA_FILE = new Arg.Positional("srcfile");
     public static final Arg PA_DIR  = new Arg.Positional("srcdir");
 
@@ -30,7 +33,7 @@
         String srcfile = (String) PA_FILE.getValue(stack);
         String srcdir  = (String) PA_DIR.getValue(stack);
 
-        System.out.println("cdm_broadcast()");
+        logger.debug("cdm_broadcast()");
         
         Policy policy = Director.lookup(srcfile);
         
@@ -51,7 +54,7 @@
        Wait until CDM has ensured that all data has been propagated.
     */
     public void cdm_wait(VariableStack stack) throws ExecutionException {
-        System.out.println("cdm_wait()");
+        logger.debug("cdm_wait()");
         Director.doBroadcast();
     }
 }

Modified: trunk/src/org/globus/swift/data/Query.java
===================================================================
--- trunk/src/org/globus/swift/data/Query.java	2010-04-11 21:50:14 UTC (rev 3281)
+++ trunk/src/org/globus/swift/data/Query.java	2010-04-12 14:55:42 UTC (rev 3282)
@@ -4,6 +4,8 @@
 import java.io.File;
 import java.io.FileReader;
 
+import org.apache.log4j.Logger;
+
 import org.globus.cog.karajan.arguments.Arg;
 import org.globus.cog.karajan.stack.VariableStack;
 import org.globus.cog.karajan.util.TypeUtil;
@@ -16,7 +18,8 @@
    Karajan-accessible read-queries to CDM functionality.
 */
 public class Query extends FunctionsCollection {
-
+    private static final Logger logger = Logger.getLogger(Query.class);
+    
     public static final Arg PA_QUERY = new Arg.Positional("query");
     public static final Arg PA_NAME  = new Arg.Positional("name");
 
@@ -32,7 +35,7 @@
     public String cdm_query(VariableStack stack) throws ExecutionException {
         String file = (String) PA_QUERY.getValue(stack);
         Policy policy = Director.lookup(file);
-        System.out.println("Director.lookup(): " + file + " -> " + policy);
+        logger.debug("Director.lookup(): " + file + " -> " + policy);
         return policy.toString();
     }