[icinga-checkins] icinga.org: icinga-web/master: * Added logging. xml to site configuration for disabling debug log

git at icinga.org git at icinga.org
Tue Feb 28 11:35:23 CET 2012


Module: icinga-web
Branch: master
Commit: 0a0c28d0cf7d56284aab1dcf8e690e999a084ee4
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=0a0c28d0cf7d56284aab1dcf8e690e999a084ee4

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Feb 28 11:33:27 2012 +0100

* Added logging.xml to site configuration for disabling debug log

---

 app/config/logging.xml.in               |    6 +++++-
 app/modules/AppKit/config/debug.xml     |   30 ------------------------------
 app/modules/AppKit/config/module.xml.in |   26 ++++++++++++++++++++------
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app/config/logging.xml.in b/app/config/logging.xml.in
index de980d3..0528809 100644
--- a/app/config/logging.xml.in
+++ b/app/config/logging.xml.in
@@ -72,6 +72,10 @@
 			<!-- AppKit Apache style, with timestamps and named loglevel -->
 			<layout name="ApacheStyle" class="AppKitApacheLoggerFormat" />
 		</layouts>
-
 	</ae:configuration>
+	
+	<!--  Try include the overwriting file -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_dir@/logging.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
+            <xi:fallback></xi:fallback>
+    </xi:include>
 </ae:configurations>
diff --git a/app/modules/AppKit/config/debug.xml b/app/modules/AppKit/config/debug.xml
deleted file mode 100644
index 77fc45b..0000000
--- a/app/modules/AppKit/config/debug.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings prefix="modules.appkit.debug." xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
-    <!--
-        Class names set here will use verbose logging, which is too detailed for productive use
-        and only usable if you're hunting for bugs in this classes.
-
-        Warning: Enabling some of those classes might end up in a huge debug log and could have
-        impact on performance!
-        
-    -->
-    <setting name="verbose">
-
-
-        <!--  Debug output for db queries -->
-        <!--
-        <ae:parameter>Api_Store_LegacyLayer_IcingaApiModel</ae:parameter>
-        -->
-        
-        <!--  Debug output for object search -->
-        <!--
-        <ae:parameter>Cronks_System_ObjectSearchResultModel</ae:parameter>
-        -->
-
-        <!-- Debug output for Session handling via Doctrine-->
-        <!--
-        <ae:parameter>AppKitDoctrineSessionStorage</ae:parameter>
-        -->
-    </setting>
-
-</settings>
diff --git a/app/modules/AppKit/config/module.xml.in b/app/modules/AppKit/config/module.xml.in
index 160d155..cddbdd9 100755
--- a/app/modules/AppKit/config/module.xml.in
+++ b/app/modules/AppKit/config/module.xml.in
@@ -79,16 +79,30 @@
                     <ae:parameter>%core.module_dir%/AppKit/config/menu.xml</ae:parameter>
                 </setting>
 
-				<setting name="agavi.include.routing">
-					<ae:parameter>%core.module_dir%/AppKit/config/routing.xml</ae:parameter>
-				</setting>
+                <setting name="agavi.include.routing">
+                	<ae:parameter>%core.module_dir%/AppKit/config/routing.xml</ae:parameter>
+                </setting>
+
+                <setting name="verbose">
+                    <!--  Debug output for db queries -->
+                    <!-- 
+                    <ae:parameter>Api_Store_LegacyLayer_IcingaApiModel</ae:parameter>
+                    -->
+                    
+                    <!--  Debug output for object search -->
+                    <!-- 
+                    <ae:parameter>Cronks_System_ObjectSearchResultModel</ae:parameter>
+                    -->
+            
+                    <!-- Debug output for Session handling via Doctrine-->
+                    <!-- 
+                    <ae:parameter>AppKitDoctrineSessionStorage</ae:parameter>
+                    -->
+                </setting>
 
             </settings>
     
             <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="auth.xml"/>
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="debug.xml">
-                <xi:fallback></xi:fallback>
-            </xi:include>
         </module>
     </ae:configuration>
     <!--  Try include the overwriting file -->





More information about the icinga-checkins mailing list