perfsonar development work

Author: michael.bischoff
Date: 2008-06-21 19:54:38 -0400 (Sat, 21 Jun 2008)
New Revision: 4037

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
Log:
improved logging a bit
fixed bug with queries returning a empty string > zero results.

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2008-06-21 18:10:37 UTC (rev 4036)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
     2008-06-21 23:54:38 UTC (rev 4037)
@@ -181,9 +181,18 @@
                     responseMessages.add(rspMsg);
                     i++;
 
-                } catch (Exception ex) {
-                    logger.error("LSRegistrationComponent error sending to ["
-                            + url + "]:  cause: " + ex.getMessage());
+                } catch (Exception ex) {                       
+                       String errorMsg = "LSRegistrationComponent error 
sending to [" + url + "]: " + ex.getClass().getName() + "->"+ ex.getMessage();
+                       
+                       StackTraceElement[] stack = ex.getStackTrace();
+                       if(stack!=null && stack.length > 0) {
+                               errorMsg += " at " + stack[0].getClassName() 
+ ":" + stack[0].getLineNumber();
+                       }
+                       
+                       if(ex.getCause() != null) {
+                               errorMsg += " underlaying cause: " + 
ex.getCause().getMessage();
+                       }
+                    logger.error(errorMsg);                                  
  
                 }
             }
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2008-06-21 18:10:37 UTC (rev 4036)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2008-06-21 23:54:38 UTC (rev 4037)
@@ -243,6 +243,12 @@
             
             //split result
             String[] params = line.split(",",2);
+            
+            if(params.length != 2) {
+               logger.debug("LSSummaryServiceContent: suppressing line; 
invalid format(value='"+line+"')");
+               break;
+            }
+            
             String key = params[0];
             String content = params[1];
             //System.out.println(" -- parse results: "+key+" : "+content);

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
        2008-06-21 18:10:37 UTC (rev 4036)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
        2008-06-21 23:54:38 UTC (rev 4037)
@@ -180,7 +180,7 @@
                     "Can't perform XQuery: "+e.getMessage());
         } catch (Exception ex) {
             throw new PerfSONARException("error.common.storage.xmldb",
-                    "There is a problem to use xml database; " + 
ex.getMessage());
+                    "There is a problem to use xml database; " + 
ex.getMessage() + " errorType="+ex.getClass().getName());
 
         }