Change the default LogLevel to "warn", and add a configure option to override

the default.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7736 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 7bc73013223789139c031288bf7dfa2c5b1acebf..865c3f8223e1b70835931458e4b7501d59fbd122 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
-CHANGES.txt - 2008-07-02
+CHANGES.txt - 2008-07-14
 ------------------------
 
 CHANGES IN CUPS V1.4b1
 
+       - The default LogLevel is now "warn" instead of "info" to reduce
+         the amount of logging that is done to disk by default.
        - The PPD compiler did not include OID query keywords in PPD
          files (STR #2871)
        - The cups-driverd helper program now directly supports driver

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index f75617fc171532ee4958c173932332f943247494..7349372bdb0435635240986f3d4409c2db34151c 100644 (file)
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -6,9 +6,9 @@
 #   file.
 #
 
-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
-LogLevel info
+# Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
+# for troubleshooting...
+LogLevel @CUPS_LOG_LEVEL@
 
 # Administrator user group...
 SystemGroup @CUPS_SYSTEM_GROUPS@

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index e26b2b2d6e77af9d49f4688c3a6d944ec845f5c0..98bd8d1b27da478e08c3cba74c08f9ef01b7c01d 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -43,6 +43,14 @@ AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm va
 AC_SUBST(CUPS_LOG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
 
+dnl Default LogLevel
+AC_ARG_WITH(log_level, [  --with-log-level        set default LogLevel value, default=warn],
+       CUPS_LOG_LEVEL="$withval",
+       CUPS_LOG_LEVEL="warn")
+AC_SUBST(CUPS_LOG_LEVEL)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_LEVEL, "$CUPS_LOG_LEVEL")
+
+
 dnl Default Browsing
 AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
 if test "x$enable_browsing" = xno; then

diff --git a/config.h.in b/config.h.in
index 27de55573b59604dc33f293a41d4298f087ea3f3..4b574dc9bee3ab8734ae1a7add1f1254bdfb41d5 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -42,6 +42,13 @@
 #define CUPS_DEFAULT_LOG_FILE_PERM     0644
 
 
+/*
+ * Default logging settings...
+ */
+
+#define CUPS_DEFAULT_LOG_LEVEL "warn"
+
+
 /*
  * Default browsing settings...
  */

diff --git a/cups/adminutil.c b/cups/adminutil.c
index 93a707a1edff6d816d6f44804e890f79019949b7..4e592514a3337b512b6273f0b3a78125bbe2a2e0 100644 (file)
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1561,7 +1561,7 @@ _cupsAdminSetServerSettings(
       else
       {
         cupsFilePuts(temp, "# Show general information in error_log.\n");
-       cupsFilePuts(temp, "LogLevel info\n");
+       cupsFilePuts(temp, "LogLevel " CUPS_DEFAULT_LOG_LEVEL "\n");
       }
     }
     else if (!strcasecmp(line, "<Policy"))
@@ -1841,7 +1841,7 @@ _cupsAdminSetServerSettings(
     else
     {
       cupsFilePuts(temp, "# Show general information in error_log.\n");
-      cupsFilePuts(temp, "LogLevel info\n");
+      cupsFilePuts(temp, "LogLevel " CUPS_DEFAULT_LOG_LEVEL "\n");
     }
   }
 

diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index b61ef0b66fc264298ed1f912ac3eda461b146652..8e05f87eb74dfc8f261d5b2616595177a8df97dc 100644 (file)
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -1884,7 +1884,7 @@ everything under the preceding levels):</P>
        <LI><CODE>notice</CODE> - Log temporary error conditions</LI>
 
        <LI><CODE>info</CODE> - Log all requests and state
-       changes (default)</LI>
+       changes</LI>
 
        <LI><CODE>debug</CODE> - Log basic debugging
        information</LI>
@@ -1894,6 +1894,8 @@ everything under the preceding levels):</P>
 
 </UL>
 
+<p>The default <code>LogLevel</code> is <code>@CUPS_LOG_LEVEL@</code>.</p>
+
 
 <H2 CLASS="title"><A NAME="MaxClients">MaxClients</A></H2>