You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/03/30 23:22:56 UTC

git commit: TS-1036 Improve some squid log compatiblity. Suggestions from mnot.

Updated Branches:
  refs/heads/master afedd5c06 -> d69561ec5


TS-1036 Improve some squid log compatiblity. Suggestions from mnot.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d69561ec
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d69561ec
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d69561ec

Branch: refs/heads/master
Commit: d69561ec54df8589dfd0da94253c68918319cb63
Parents: afedd5c
Author: Leif Hedstrom <le...@ogre.com>
Authored: Fri Mar 30 15:22:40 2012 -0600
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Fri Mar 30 15:22:40 2012 -0600

----------------------------------------------------------------------
 CHANGES              |    2 ++
 proxy/logging/Log.cc |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d69561ec/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e5a4259..afa75bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.4
+  *) [TS-1036] Improve some squid log compatiblity. Suggestions from mnot.
+
   *) [TS-1092] Remove specific SSL termination mode, we either terminate, or
     we do not.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d69561ec/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index d779377..2c7b962 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -572,12 +572,12 @@ Log::init_fields()
                        SQUID_LOG_TCP_MISS, "TCP_MISS",
                        SQUID_LOG_TCP_EXPIRED_MISS, "TCP_EXPIRED_MISS",
                        SQUID_LOG_TCP_REFRESH_HIT, "TCP_REFRESH_HIT",
-                       SQUID_LOG_TCP_REF_FAIL_HIT, "TCP_REF_FAIL_HIT",
+                       SQUID_LOG_TCP_REF_FAIL_HIT, "TCP_REFRESH_FAIL_HIT",
                        SQUID_LOG_TCP_REFRESH_MISS, "TCP_REFRESH_MISS",
-                       SQUID_LOG_TCP_CLIENT_REFRESH, "TCP_CLIENT_REFRESH",
+                       SQUID_LOG_TCP_CLIENT_REFRESH, "TCP_CLIENT_REFRESH_MISS",
                        SQUID_LOG_TCP_IMS_HIT, "TCP_IMS_HIT",
                        SQUID_LOG_TCP_IMS_MISS, "TCP_IMS_MISS",
-                       SQUID_LOG_TCP_SWAPFAIL, "TCP_SWAPFAIL",
+                       SQUID_LOG_TCP_SWAPFAIL, "TCP_SWAPFAIL_MISS",
                        SQUID_LOG_TCP_DENIED, "TCP_DENIED",
                        SQUID_LOG_TCP_WEBFETCH_MISS, "TCP_WEBFETCH_MISS",
                        SQUID_LOG_TCP_SPIDER_BYPASS, "TCP_SPIDER_BYPASS",