access_log syslog facility and priority specification using the familiar facility...

This update finalizes the access_log syslog syntax changes, ending up with
the same syntax as used in syslog.conf. facility.priority

The original 'C' form also understood. LOG_USER4|LOG_INFO

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 109c7538687fa924bae8fdde057bb9e1dcac417d..8568fc3400f19301607e63a97fafee23fe7ff6d8 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.454 2007/08/21 23:19:36 hno Exp $
+# $Id: cf.data.pre,v 1.455 2007/08/21 23:50:12 hno Exp $
 #
 # SQUID Web Proxy Cache                http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -1159,7 +1159,7 @@ DOC_START
 
        To log the request via syslog specify a filepath of "syslog":
 
-       access_log syslog[:facility|priority] [format [acl1 [acl2 ....]]]
+       access_log syslog[:facility.priority] [format [acl1 [acl2 ....]]]
        where facility could be any of:
        authpriv, daemon, local9 .. local7 or user.
 

diff --git a/src/logfile.cc b/src/logfile.cc
index 60242659050ce3eface49ca1f0fa672d5e28edeb..25b489a7d3665cf908c238c72d12ec118c897412 100644 (file)
--- a/src/logfile.cc
+++ b/src/logfile.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: logfile.cc,v 1.23 2007/08/21 16:41:06 hno Exp $
+ * $Id: logfile.cc,v 1.24 2007/08/21 23:50:12 hno Exp $
  *
  * DEBUG: section 50    Log file handling
  * AUTHOR: Duane Wessels
@@ -102,7 +102,10 @@ logfileOpen(const char *path, size_t bufsz, int fatal_flag)
 
         if (path[6] != '\0') {
             path += 7;
-            char* delim = strchr(path, '|');
+            char* delim = strchr(path, '.');
+
+           if (!delim)
+               delim = strchr(path, '|');
 
             if (delim != NULL)
                 *delim = '\0';