[Hyperic-hq-discuss] hq r13661 - in trunk: src/org/hyperic/hq/hqu/rendit_sys ui_plugins/alertcenter/app ui_plugins/eventcenter/app ui_plugins/health/app ui_plugins/systemsdown/app

[<rm...@hy...>]

Author: rmorgan
Date: 2009-08-25 14:32:50 -0700 (Tue, 25 Aug 2009)
New Revision: 13661
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13661

Modified:
   trunk/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy
   trunk/ui_plugins/alertcenter/app/AlertController.groovy
   trunk/ui_plugins/eventcenter/app/EventController.groovy
   trunk/ui_plugins/health/app/HealthController.groovy
   trunk/ui_plugins/systemsdown/app/SystemsdownController.groovy
Log:
Un-hardcode controller names that restrict logging.  These names conflict with the controller
names in HQApi, causing requests to not be logged.  Instead create a logRequests() API in 
BaseController which can be overriden by controllers.
[HHQ-3366]



Modified: trunk/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy
===================================================================
--- trunk/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy	2009-08-25 21:30:55 UTC (rev 13660)
+++ trunk/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy	2009-08-25 21:32:50 UTC (rev 13661)
@@ -153,7 +153,11 @@
     File getViewDir() {
         this.viewDir
     }
-    
+
+    boolean logRequests() {
+        true
+    }
+
     /**
      * Called by the dispatcher when a controller action is dispatched.
      *
@@ -182,10 +186,7 @@
 	        return
 	    }
 	    
-	    if (!lowestClass.name.equals("HealthController") &&
-	        !lowestClass.name.equals("SystemsdownController") &&
-	        !lowestClass.name.equals("EventController") &&
-	        !lowestClass.name.equals("AlertController")) {
+	    if (logRequests()) {
 	       log.info "Invoking method: ${action} with ${params}"
 	    } else if (log.debugEnabled) {
 	       log.debug "Invoking method: ${action} with ${params}"

Modified: trunk/ui_plugins/alertcenter/app/AlertController.groovy
===================================================================
--- trunk/ui_plugins/alertcenter/app/AlertController.groovy	2009-08-25 21:30:55 UTC (rev 13660)
+++ trunk/ui_plugins/alertcenter/app/AlertController.groovy	2009-08-25 21:32:50 UTC (rev 13661)
@@ -30,7 +30,11 @@
         def minPriority = params.getOne('minPriority', '1')
         def severity = AlertSeverity.findByCode(minPriority.toInteger())
     }        
-    
+
+    boolean logRequests() {
+        false
+    }    
+
     private getNow() {
         System.currentTimeMillis()
     }

Modified: trunk/ui_plugins/eventcenter/app/EventController.groovy
===================================================================
--- trunk/ui_plugins/eventcenter/app/EventController.groovy	2009-08-25 21:30:55 UTC (rev 13660)
+++ trunk/ui_plugins/eventcenter/app/EventController.groovy	2009-08-25 21:32:50 UTC (rev 13661)
@@ -45,6 +45,10 @@
         ],
     ]   
 
+    boolean logRequests() {
+        false
+    }
+    
     private List getInGroups(params) {
         def inGroups = params.getOne('groups', '')
         

Modified: trunk/ui_plugins/health/app/HealthController.groovy
===================================================================
--- trunk/ui_plugins/health/app/HealthController.groovy	2009-08-25 21:30:55 UTC (rev 13660)
+++ trunk/ui_plugins/health/app/HealthController.groovy	2009-08-25 21:32:50 UTC (rev 13661)
@@ -42,7 +42,11 @@
         setJSONMethods(['getSystemStats', 'getDiag', 'cacheData', 
                         'agentData', 'runQuery', 'executeQuery'])
     }
-    
+
+    boolean logRequests() {
+        false
+    }
+
     private getAgentSchema() {
         def res = [
             getData: {pageInfo, params ->

Modified: trunk/ui_plugins/systemsdown/app/SystemsdownController.groovy
===================================================================
--- trunk/ui_plugins/systemsdown/app/SystemsdownController.groovy	2009-08-25 21:30:55 UTC (rev 13660)
+++ trunk/ui_plugins/systemsdown/app/SystemsdownController.groovy	2009-08-25 21:32:50 UTC (rev 13661)
@@ -47,7 +47,11 @@
    def SystemsdownController() {
         setTemplate('standard')
     }
-    
+
+    boolean logRequests() {
+        false
+    }    
+
     def getNow() {
         System.currentTimeMillis()
     }