------------------------------------------------------------ revno: 12634 revision-id: squid3@treenet.co.nz-20131003111810-6g3gfb2d2ttp19vb parent: squid3@treenet.co.nz-20131003111730-gs8mfc7dk7hsq89y committer: Amos Jeffries branch nick: 3.3 timestamp: Thu 2013-10-03 05:18:10 -0600 message: Polish: better WARNING when workers directive is ignore on reconfigure. Changing the workers directive requires a proxy restart, not just a reconfigure. State this clearly in the warning message. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131003111810-6g3gfb2d2ttp19vb # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 98a9a91d8e2505c444c2cfe4db86f57d334b7215 # timestamp: 2013-10-03 11:19:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20131003111730-\ # gs8mfc7dk7hsq89y # # Begin patch === modified file 'src/main.cc' --- src/main.cc 2013-09-09 07:17:19 +0000 +++ src/main.cc 2013-10-03 11:18:10 +0000 @@ -808,7 +808,7 @@ if (oldWorkers != Config.workers) { debugs(1, DBG_CRITICAL, "WARNING: Changing 'workers' (from " << oldWorkers << " to " << Config.workers << - ") is not supported and ignored"); + ") requires a full restart. It has been ignored by reconfigure."); Config.workers = oldWorkers; }