------------------------------------------------------------
revno: 12349
revision-id: squid3@treenet.co.nz-20121010013216-p0ymfqqrezbsyvqc
parent: squidadm@squid-cache.org-20121006042158-m42ilkkin86rxijt
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2012-10-09 19:32:16 -0600
message:
  Polish: use DBG_PARSE_NOTE to warn about deprecated logformat tokens
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121010013216-p0ymfqqrezbsyvqc
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 56fa2a88a31e136674bd739cedde8fa336943117
# timestamp: 2012-10-10 01:32:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squidadm@squid-cache.org-20121006042158-\
#   m42ilkkin86rxijt
# 
# Begin patch
=== modified file 'src/format/Token.cc'
--- src/format/Token.cc	2012-09-04 09:10:20 +0000
+++ src/format/Token.cc	2012-10-10 01:32:16 +0000
@@ -2,6 +2,7 @@
 #include "format/Config.h"
 #include "format/Token.h"
 #include "format/TokenTableEntry.h"
+#include "globals.h"
 #include "SquidConfig.h"
 #include "Store.h"
 
@@ -527,22 +528,22 @@
         break;
 
     case LFT_HTTP_SENT_STATUS_CODE_OLD_30:
-        debugs(46, DBG_CRITICAL, "WARNING: The \"Hs\" formatting code is deprecated. Use the \">Hs\" instead.");
+        debugs(46, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: The \"Hs\" formatting code is deprecated. Use the \">Hs\" instead.");
         type = LFT_HTTP_SENT_STATUS_CODE;
         break;
 
     case LFT_SERVER_LOCAL_IP_OLD_27:
-        debugs(46, DBG_CRITICAL, "WARNING: The \"oa\" formatting code is deprecated. Use the \"<la\" instead.");
+        debugs(46, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: The \"oa\" formatting code is deprecated. Use the \"<la\" instead.");
         type = LFT_SERVER_LOCAL_IP;
         break;
 
     case LFT_REQUEST_URLPATH_OLD_31:
-        debugs(46, DBG_CRITICAL, "WARNING: The \"rp\" formatting code is deprecated. Use the \">rp\" instead.");
+        debugs(46, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: The \"rp\" formatting code is deprecated. Use the \">rp\" instead.");
         type = LFT_CLIENT_REQ_URLPATH;
         break;
 
     case LFT_REQUEST_VERSION_OLD_2X:
-        debugs(46, DBG_CRITICAL, "WARNING: The \">v\" formatting code is deprecated. Use the \">rv\" instead.");
+        debugs(46, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: The \">v\" formatting code is deprecated. Use the \">rv\" instead.");
         type = LFT_REQUEST_VERSION;
         break;