From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Fri, 9 May 2008 12:18:56 +0000 (-0600)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_0_STABLE6~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548e84aaec9c82379ebf7d09a77323e1de931970;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Bug #1784: access_log syslog results in blanks syslog lines
between every access log entry.

Correct earlier forwardport of Squid-2 patch. There must only be
one log call per entry..
---

diff --git a/src/access_log.cc b/src/access_log.cc
index 24df692e49..fe1428e7f9 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1296,7 +1296,7 @@ accessLogSquid(AccessLogEntry * al, Logfile * logfile)
         safe_free(user);
 
     if (!Config.onoff.log_mime_hdrs) {
-        logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %"PRId64" %s %s %s %s%s/%s %s",
+        logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %"PRId64" %s %s %s %s%s/%s %s\n",
                       (long int) current_time.tv_sec,
                       (int) current_time.tv_usec / 1000,
                       al->cache.msec,
@@ -1314,7 +1314,7 @@ accessLogSquid(AccessLogEntry * al, Logfile * logfile)
     } else {
         char *ereq = log_quote(al->headers.request);
         char *erep = log_quote(al->headers.reply);
-        logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %"PRId64" %s %s %s %s%s/%s %s [%s] [%s]",
+        logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %"PRId64" %s %s %s %s%s/%s %s [%s] [%s]\n",
                       (long int) current_time.tv_sec,
                       (int) current_time.tv_usec / 1000,
                       al->cache.msec,
@@ -1334,7 +1334,6 @@ accessLogSquid(AccessLogEntry * al, Logfile * logfile)
         safe_free(ereq);
         safe_free(erep);
     }
-    logfilePrintf(logfile, "\n");
     safe_free(user);
 }