perfsonar development work

Author: roman
Date: 2006-09-06 10:13:45 -0400 (Wed, 06 Sep 2006)
New Revision: 1611

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
   trunk/perfsonar/src/org/perfsonar/service/web/RequestHandler.java
Log:
Changes to have more understandable log messages in log files.

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
        2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
        2006-09-06 14:13:45 UTC (rev 1611)
@@ -123,9 +123,9 @@
         String query = transformations.getMetadataQuery(dataQuery);
 
 
-        //logger.debug("MetadataConfigurationStorageManager.fetch: "
-        //      + "metadata query: "
-        //      + query);
+        logger.debug("MetadataConfigurationStorageManager.fetch: "
+              + "xquery to fetch metadata/data from the metadata 
configuration: \n"
+              + query);
 
 
         // if query is an empty string then the method returns empty message
@@ -140,7 +140,7 @@
         try {
             object = this.existDbXmlStorageManager.fetch(query);
         } catch (Exception ex) {
-            logger.debug("MetadataConfigurationStorageManager.fetch: "
+            logger.error("MetadataConfigurationStorageManager.fetch: "
                     + "Connection to xml database failed: "
                     + ex.toString());
             throw new SystemException(
@@ -157,8 +157,8 @@
 
 
         logger.debug("MetadataConfigurationStorageManager.fetch: "
-            + "XQuery result received " 
-            + "(" + xmlResults.length + ")");
+            + "The number of elements returned as a result of xquery 
statement: " 
+            + xmlResults.length);
 
 
         if (xmlResults.length == 0)
@@ -187,9 +187,6 @@
                 + xmlResults[i]
                 + "</nmwg:message>";
 
-            //logger.debug("MetadataConfigurationStorageManager.fetch: xml 
result: "
-            //      + xmlResult);
-
             String[] tagNames = {"metadata", "data"};
             Map elements =
                 transformations.transformResults(xmlResult, tagNames);
@@ -202,10 +199,6 @@
                         + "sent from xml database");
 
 
-            logger.debug("MetadataConfigurationStorageManager.fetch: "
-                    + "number of elements fetched from "
-                    + "the metadata configuration: " + elements.size());
-
             Collection<Element> collection = elements.values();
             for (Element elem : collection) {
                 message.addChild(elem);
@@ -226,7 +219,7 @@
 
         if (data == null) {
             logger.error("MetadataConfigurationStorageManager.store: "
-                    + "No data block to store");
+                    + "No data element to store");
             throw new SystemException(
                     "error.ma.query",
                     "MetadataConfigurationStorageManager.store: "
@@ -241,8 +234,9 @@
                             + "\n</xu:append>\n"
                             + "</xu:modifications>";
 
-        //logger.debug("RRDConfigurationStorageManagerdata.store: 
dataXUpdate: "
-        //        + dataXUpdate);
+        logger.debug("RRDConfigurationStorageManagerdata.store: "
+                       + "Xupdate statement to store data element: \n"
+                + dataXUpdate);
 
 
 
@@ -267,8 +261,9 @@
                             + "\n</xu:append>\n"
                             + "</xu:modifications>";
 
-        //logger.debug("RRDConfigurationStorageManagerdata.store: 
metaXUpdate: "
-        //        + metaXUpdate);
+        logger.debug("RRDConfigurationStorageManagerdata.store: "
+                       + "XUpdate statement to store metadata element: \n"
+                + metaXUpdate);
 
 
         this.existDbXmlStorageManager.store(metaXUpdate);

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
  2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
  2006-09-06 14:13:45 UTC (rev 1611)
@@ -154,9 +154,10 @@
 
         String query = this.transformations.getMetadataQuery(dataQuery);
 
-        //logger.debug(
-        //        "SimpleMetadataConfigurationStorageManager.fetch: "
-        //        +"metadata query: " + query);
+        logger.debug(
+                "SimpleMetadataConfigurationStorageManager.fetch: "
+                       + "xquery to fetch metadata/data from the metadata 
configuration: \n"
+                + query);
 
 
         Configuration saxonConfig = new Configuration();
@@ -199,8 +200,8 @@
                         + "No metadata in metadata configuration file");
 
             logger.debug("SimpleMetadataConfigurationStorageManager.fetch: "
-                    + "number of elements fetched from "
-                    + "the metadata configuration: " + elements.size());
+                       + "The number of elements returned as a result of 
xquery statement: "
+                    + elements.size());
 
             Collection<Element> collection = elements.values();
             for (Element elem : collection) {

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
       2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/MetadataQueryGeneratorFactory.java
       2006-09-06 14:13:45 UTC (rev 1611)
@@ -58,10 +58,10 @@
 
         String className = eventType.getMetadataQueryGenerator();
 
-        logger.debug(
-                "MetadataQueryGeneratorFactory.getMetadataQueryGenerator: "
-                + "class name for eventType (" + eventTypeName + "):  "
-                + className);
+        //logger.debug(
+        //        "MetadataQueryGeneratorFactory.getMetadataQueryGenerator: "
+        //        + "class name for eventType (" + eventTypeName + "):  "
+        //        + className);
 
         if (className == null || className.trim().equals("")) 
             throw new SystemException(

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-09-06 14:13:45 UTC (rev 1611)
@@ -132,7 +132,6 @@
         }
 
 
-
         // checking if using xml db is allowed
         String dbStatus =
                 configuration.getProperty("component.ma.xmldb.db_status");
@@ -248,7 +247,7 @@
 
             // invalid action type
 
-            logger.fatal(
+            logger.error(
                 "RRDTypeMAServiceEngine.takeAction: ActionType specified: "
                 + actionType + " is not supported");
 

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
 2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
 2006-09-06 14:13:45 UTC (rev 1611)
@@ -177,11 +177,13 @@
                 }
 
 
-                logger.debug("SQLStorageManager.fetch: number of fetched 
rows: "
-                        + resultList.size());
+                //logger.debug("SQLStorageManager.fetch: "
+                //             + "The number of fetched rows from db for 
metadata "
+                //             + md.getId() + ": "
+                //        + resultList.size());
 
                 String eventType = (String)ibatisParams.get("eventType");
-                logger.debug("SQLStorageManager.fetch: EventType: " + 
eventType);
+                //logger.debug("SQLStorageManager.fetch: EventType: " + 
eventType);
 
                 ResponseGenerator responseGenerator =
                     ResponseGeneratorFactory.getResponseGenerator(eventType);
@@ -189,7 +191,7 @@
 
             } catch (Exception ioex) {
 
-                logger.debug("SQLStorageManager.fetch: Unable to fetch data: 
"
+                logger.error("SQLStorageManager.fetch: Unable to fetch data: 
"
                         + ioex.toString());
                 throw new RequestException(
                         "error.sqlma.db_connection",
@@ -263,7 +265,7 @@
                 sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader);
 
                 String eventType = (String)ibatisParams.get("eventType");
-                logger.debug("SQLStorageManager.store: EventType: " + 
eventType);
+                //logger.debug("SQLStorageManager.store: EventType: " + 
eventType);
 
                 StoreRequestProcess storeRequestProcess =
                        
StoreRequestProcessFactory.getStoreRequestProcess(eventType);

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
    2006-09-06 13:15:05 UTC (rev 1610)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
    2006-09-06 14:13:45 UTC (rev 1611)
@@ -54,10 +54,10 @@
 
         String className = eventType.getResponseGenerator();
 
-        logger.debug(
-                "ResponseGeneratorFactory.getResponseGenerator: "
-                + "class name for eventType (" + eventTypeName + "):  "
-                + className);
+        //logger.debug(
+        //        "ResponseGeneratorFactory.getResponseGenerator: "
+        //        + "class name for eventType (" + eventTypeName + "):  "
+        //        + className);
 
         if (className == null || className.trim().equals("")) 
             throw new SystemException(

Modified: trunk/perfsonar/src/org/perfsonar/service/web/RequestHandler.java
===================================================================
--- trunk/perfsonar/src/org/perfsonar/service/web/RequestHandler.java   
2006-09-06 13:15:05 UTC (rev 1610)
+++ trunk/perfsonar/src/org/perfsonar/service/web/RequestHandler.java   
2006-09-06 14:13:45 UTC (rev 1611)
@@ -122,7 +122,7 @@
 
             if (requestMessage!=null) {
 
-                logger.info("RequestHandler: " +
+                logger.debug("RequestHandler: " +
                         "Message object constructed from request. " +
                         "Request is of type: " + 
                         requestMessage.getType());
@@ -149,7 +149,7 @@
 
                 // Call on the mh to "execute" the message and return
                 // a response message.
-                logger.info(
+                logger.debug(
                     "RequestHandler: " +
                     "Calling on MessageHandler ["+
                     messageHandler.getClass()+"] to satisfy request");
@@ -170,6 +170,8 @@
 
                 //if everything went fine, return response document to Axis
 
+                logger.info("RequestHandler: Service sent a successful 
response");
+
                 return responseDocument;
 
 
@@ -218,6 +220,9 @@
 
             }
 
+            logger.info("RequestHandler: Service sent a response "
+                       + "with error information");
+
             return responseDocument;
 
         }