perfsonar development work

Author: psnc.pietrzak
Date: 2013-01-16 13:15:42 +0000 (Wed, 16 Jan 2013)
New Revision: 6114

Modified:
   trunk/psBase3/perfsonar-base/pom.xml
   
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/PerfSONAR.java
   
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/nmwg/response/SelfTestResponse.java
Log:
Logging using SL4J and Log4j.

Modified: trunk/psBase3/perfsonar-base/pom.xml
===================================================================
--- trunk/psBase3/perfsonar-base/pom.xml        2013-01-16 12:38:19 UTC (rev 
6113)
+++ trunk/psBase3/perfsonar-base/pom.xml        2013-01-16 13:15:42 UTC (rev 
6114)
@@ -73,6 +73,17 @@
                        <type>bundle</type>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>1.6.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+                       <version>1.2.16</version>
+                       <type>bundle</type>
+               </dependency>
        </dependencies>
 
        <build>

Modified: 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/PerfSONAR.java
===================================================================
--- 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/PerfSONAR.java 
      2013-01-16 12:38:19 UTC (rev 6113)
+++ 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/PerfSONAR.java 
      2013-01-16 13:15:42 UTC (rev 6114)
@@ -36,6 +36,8 @@
 import net.geant.perfsonar.selftest.SelfTestRunner;
 import net.geant.perfsonar.xpath.XPathDeserializer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 /**
@@ -48,6 +50,8 @@
        
        private static int defaultThreadPoolSize = 10;
        
+       private static Logger logger = 
LoggerFactory.getLogger(PerfSONAR.class);
+       
        static {
                try {
                        declarePrefix("nmwg", 
"http://ggf.org/ns/nmwg/base/2.0/";);
@@ -77,7 +81,7 @@
                                        try {
                                                
registerToLookupService(address);
                                        } catch (Exception ex) {
-                                               ex.printStackTrace();
+                                               logger.error("Could not 
register to Lookup Service.", ex);
                                        }
                                }
                        }
@@ -140,6 +144,7 @@
                try {
                        objects = (List<Object>) 
deserializer.deserialize(toInputSource(request));//.getCharacterStream());
                } catch (Exception e1) {
+                       logger.error("Could not deserialize the request.", 
e1);
                        return null;
                }
                
@@ -173,10 +178,10 @@
                                try {
                                        TemplateEngine.evaluate(writer, 
m.getDeclaringClass(), msg.getType().replace("Request", "Response.template"));
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                       logger.error("Could not fill in the 
template for the response.", e);
                                }
                        } catch (Exception ex) {
-                               ex.printStackTrace();
+                               logger.error("Could not process the 
request.", ex);
                                return null;
                        }
                        
@@ -202,12 +207,11 @@
                        response.begin(writer, msg.getId());
                        newSelfTestRunner().runSuite(scheduler, response);
                } catch (Exception ex) {
-                       ex.printStackTrace();
+                       logger.error("Could not run self tests.", ex);
                } finally {
                        try {
                                response.end();
-                       } catch (IOException ex) {
-                       }
+                       } catch (IOException ex) { }
                }
 
                return new StreamSource(new StringReader(writer.toString()));
@@ -284,7 +288,7 @@
                                        writer.flush();
                                        out.close();
                                } catch (IOException ex) {
-                                       ex.printStackTrace();
+                                       logger.error("Could not register in 
LookupService.", ex);
                                }
                        }
 
@@ -305,7 +309,7 @@
                                if (msg.getKey() != null)
                                        keys.put(address, msg.getKey());
                        } catch (Exception e) {
-                               e.printStackTrace();
+                               logger.error("Could not deserialize key from 
Lookup Service response.", e);
                        }
                } else
                        client.invoke(new StreamSource(in));

Modified: 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/nmwg/response/SelfTestResponse.java
===================================================================
--- 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/nmwg/response/SelfTestResponse.java
  2013-01-16 12:38:19 UTC (rev 6113)
+++ 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/nmwg/response/SelfTestResponse.java
  2013-01-16 13:15:42 UTC (rev 6114)
@@ -3,10 +3,15 @@
 import java.io.IOException;
 import java.io.Writer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.geant.perfsonar.ServiceType;
 import net.geant.perfsonar.selftest.SelfTestLogger;
 
 public class SelfTestResponse implements SelfTestLogger {
+       private static Logger logger = 
LoggerFactory.getLogger(SelfTestResponse.class);
+       
        private Writer writer;
        
        public SelfTestResponse(ServiceType serviceType, String serviceName) 
throws Exception {
@@ -31,7 +36,7 @@
                try {
                        TemplateEngine.evaluate(writer, 
SelfTestResponse.class, "SelfTest_success.template");
                } catch (IOException e) {
-                       e.printStackTrace();
+                       logger.error("Could not fill in the template with 
self test results.", e);
                }
        }
 
@@ -41,8 +46,7 @@
                try {
                        TemplateEngine.evaluate(writer, 
SelfTestResponse.class, "SelfTest_failure.template");
                } catch (IOException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
+                       logger.error("Could not fill in the template with 
self test results.", e);
                }
        }
 }