[icinga-checkins] icinga.org: icinga-web/mfriedrich/fixes: * Added agavi debug to devel mode

git at icinga.org git at icinga.org
Mon Jan 10 09:04:58 CET 2011


Module: icinga-web
Branch: mfriedrich/fixes
Commit: 7e620c98174b0d3580ec8f4fecff2b95215e28b2
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7e620c98174b0d3580ec8f4fecff2b95215e28b2

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Dec 14 14:20:50 2010 +0100

* Added agavi debug to devel mode

---

 .gitignore                                   |    1 +
 Makefile.in                                  |    1 +
 aclocal.m4                                   |    3 ++-
 app/config/{settings.xml => settings.xml.in} |    6 ++----
 configure                                    |   13 ++++++++++---
 configure.ac                                 |    5 +++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3976fc3..a7de16b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ app/cache/content
 app/data/log/
 app/config/icinga.xml
 app/config/databases.xml
+app/config/settings.xml
 app/modules/Web/config/icinga-io.xml
 app/modules/AppKit/cache/Widgets/SquishLoader.xml
 bin/clearcache.sh
diff --git a/Makefile.in b/Makefile.in
index e5574cc..e3d7490 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,7 @@ distclean:
 	etc/sitecfg/Makefile \
 	app/config/databases.xml \
 	app/config/icinga.xml \
+	app/config/settings.xml \
 	app/modules/Web/config/icinga-io.xml \
 	app/modules/AppKit/cache/Widgets/SquishLoader.xml \
 	etc/build.properties \
diff --git a/aclocal.m4 b/aclocal.m4
index 6d4c716..3a9d7df 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -61,6 +61,7 @@ AC_DEFUN([ACICINGA_DEVEL_MODE], [
 	AC_MSG_CHECKING([for devel-mode])
 	AS_IF([ test "$devel_mode" == "yes" ], [
 		flag_caching="false"
-		AC_MSG_RESULT([YES (!!)]) 
+		flag_debug="true"
+		AC_MSG_RESULT([YES ... debug=true, caching=false (!!)]) 
 	], [ AC_MSG_RESULT([no (good)]) ])
 ])
\ No newline at end of file
diff --git a/app/config/settings.xml b/app/config/settings.xml.in
similarity index 96%
rename from app/config/settings.xml
rename to app/config/settings.xml.in
index fb1049e..d8f551b 100755
--- a/app/config/settings.xml
+++ b/app/config/settings.xml.in
@@ -39,7 +39,8 @@
 			<setting name="app_name">icinga</setting>
 
 			<setting name="available">true</setting>
-			<setting name="debug">false</setting>
+			
+			<setting name="debug">@flag_debug@</setting>
 
 			<setting name="use_database">true</setting>
 			<setting name="use_logging">true</setting>
@@ -75,9 +76,6 @@
 	</ae:configuration>
 
 	<ae:configuration environment="development.*">
-		<settings>
-			<setting name="debug">false</setting>
-		</settings>
 	</ae:configuration>
 
 	<ae:configuration environment="production.*">
diff --git a/configure b/configure
index 6fde2db..08cef4b 100755
--- a/configure
+++ b/configure
@@ -560,6 +560,7 @@ PACKAGE_URL=''
 ac_default_prefix=/usr/local/icinga-web
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+flag_debug
 flag_caching
 INSTALL_OPTS_CACHE
 INSTALL_OPTS_WEB
@@ -2509,7 +2510,10 @@ fi
 INSTALL_OPTS="-o $bin_user -g $bin_group"
 INSTALL_OPTS_WEB="-o $web_user -g $web_group"
 INSTALL_OPTS_CACHE="-o $web_user -g $web_group"
+
 flag_caching=true
+flag_debug=false
+
 CFLAGS=""
 
 
@@ -2518,8 +2522,9 @@ $as_echo_n "checking for devel-mode... " >&6; }
 	if  test "$devel_mode" == "yes" ; then :
 
 		flag_caching="false"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: YES (!!)" >&5
-$as_echo "YES (!!)" >&6; }
+		flag_debug="true"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: YES ... debug=true, caching=false (!!)" >&5
+$as_echo "YES ... debug=true, caching=false (!!)" >&6; }
 
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (good)" >&5
@@ -2566,7 +2571,8 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/modules/Web/config/icinga-io.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml etc/build.properties etc/tests/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
+
+ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/settings.xml app/modules/Web/config/icinga-io.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml etc/build.properties etc/tests/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
 
 
 cat >confcache <<\_ACEOF
@@ -3285,6 +3291,7 @@ do
     "etc/sitecfg/Makefile") CONFIG_FILES="$CONFIG_FILES etc/sitecfg/Makefile" ;;
     "app/config/databases.xml") CONFIG_FILES="$CONFIG_FILES app/config/databases.xml" ;;
     "app/config/icinga.xml") CONFIG_FILES="$CONFIG_FILES app/config/icinga.xml" ;;
+    "app/config/settings.xml") CONFIG_FILES="$CONFIG_FILES app/config/settings.xml" ;;
     "app/modules/Web/config/icinga-io.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Web/config/icinga-io.xml" ;;
     "app/modules/AppKit/cache/Widgets/SquishLoader.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/cache/Widgets/SquishLoader.xml" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
diff --git a/configure.ac b/configure.ac
index c1b4190..acd6d10 100755
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,10 @@ AC_ARG_WITH([devel_mode],
 INSTALL_OPTS="-o $bin_user -g $bin_group"
 INSTALL_OPTS_WEB="-o $web_user -g $web_group"
 INSTALL_OPTS_CACHE="-o $web_user -g $web_group"
+
 flag_caching=true
+flag_debug=false
+
 CFLAGS=""
 
 ACICINGA_DEVEL_MODE()
@@ -264,6 +267,7 @@ AC_SUBST(INSTALL_OPTS)
 AC_SUBST(INSTALL_OPTS_WEB)
 AC_SUBST(INSTALL_OPTS_CACHE)
 AC_SUBST(flag_caching)
+AC_SUBST(flag_debug)
 
 
 AC_CONFIG_FILES([
@@ -277,6 +281,7 @@ AC_CONFIG_FILES([
 	etc/sitecfg/Makefile
 	app/config/databases.xml
 	app/config/icinga.xml
+	app/config/settings.xml
 	app/modules/Web/config/icinga-io.xml
 	app/modules/AppKit/cache/Widgets/SquishLoader.xml
 	etc/build.properties





More information about the icinga-checkins mailing list