------------------------------------------------------------ revno: 13886 revision-id: squid3@treenet.co.nz-20150820134421-kye79zzutzjns33m parent: squid3@treenet.co.nz-20150820134251-3eq9epc9ig1ekyuh committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2015-08-20 06:44:21 -0700 message: Polish: add debug section,level to cache.log Cache.log produced at level ALL,9 are very verbose, and tracking down what specific section,level details to log for a shorter trace without lost details can sometimes be tricky and time consuming. Particularly when multiple sections are involved. This patch adds a column containing the relevant debug_options SECTION,LEVEL value on each line right after the kidN number for debug levels 2+. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150820134421-kye79zzutzjns33m # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 7657c1490d86a39335456a2675759cb43824ad66 # timestamp: 2015-08-20 13:50:59 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150820134251-\ # 3eq9epc9ig1ekyuh # # Begin patch === modified file 'src/Debug.h' --- src/Debug.h 2015-01-13 09:13:49 +0000 +++ src/Debug.h 2015-08-20 13:44:21 +0000 @@ -94,8 +94,10 @@ if ((Debug::level = (LEVEL)) <= Debug::Levels[SECTION]) { \ Debug::sectionLevel = Debug::Levels[SECTION]; \ std::ostream &_dbo=Debug::getDebugOut(); \ - if (Debug::level > DBG_IMPORTANT) \ - _dbo << SkipBuildPrefix(__FILE__)<<"("<<__LINE__<<") "<<__FUNCTION__<<": "; \ + if (Debug::level > DBG_IMPORTANT) { \ + _dbo << (SECTION) << ',' << (LEVEL) << "| " \ + << SkipBuildPrefix(__FILE__)<<"("<<__LINE__<<") "<<__FUNCTION__<<": "; \ + } \ _dbo << CONTENT; \ Debug::finishDebug(); \ } \