--------------------- PatchSet 3673 Date: 2002/02/17 08:57:57 Author: serassio Branch: nt-2_3 Tag: (none) Log: Added 'Reconfigure the Squid Process' functionality and WIN32 specific info in 'General Runtime Information' in Cache Manager Members: doc/WIN32-ChangeLog.txt:1.1.2.8->1.1.2.9 src/cache_manager.c:1.1.1.2.4.1.2.2->1.1.1.2.4.1.2.3 src/stat.c:1.1.1.3.4.1.2.6->1.1.1.3.4.1.2.7 Index: squid/doc/WIN32-ChangeLog.txt =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/Attic/WIN32-ChangeLog.txt,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- squid/doc/WIN32-ChangeLog.txt 16 Feb 2002 18:20:31 -0000 1.1.2.8 +++ squid/doc/WIN32-ChangeLog.txt 17 Feb 2002 08:57:57 -0000 1.1.2.9 @@ -62,8 +62,6 @@ - Added intermittent connections patch from O'Reilly Linux DevCenter at http://linux.oreillynet.com/pub/a/linux/2001/08/02/offline_squid.html - (Guido Serassio) 16 Feb 2002 - Backported SNMP patches from HEAD - (Guido Serassio) - - - - - +17 Feb 2002 - Added "Reconfigure the Squid Process" functionality to Cache Manager - (Guido Serassio) + - Added WIN32 specific info in "General Runtime Information" Cache Manager + function - (Guido Serassio) \ No newline at end of file Index: squid/src/cache_manager.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cache_manager.c,v retrieving revision 1.1.1.2.4.1.2.2 retrieving revision 1.1.1.2.4.1.2.3 diff -u -r1.1.1.2.4.1.2.2 -r1.1.1.2.4.1.2.3 --- squid/src/cache_manager.c 10 Feb 2002 17:55:55 -0000 1.1.1.2.4.1.2.2 +++ squid/src/cache_manager.c 17 Feb 2002 08:57:57 -0000 1.1.1.2.4.1.2.3 @@ -1,21 +1,21 @@ /* - * $Id: cache_manager.c,v 1.1.1.2.4.1.2.2 2002/02/10 17:55:55 serassio Exp $ + * $Id: cache_manager.c,v 1.1.1.2.4.1.2.3 2002/02/17 08:57:57 serassio Exp $ * * DEBUG: section 16 Cache Manager Objects * AUTHOR: Duane Wessels * - * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ + * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * - * Squid is the result of efforts by numerous individuals from the - * Internet community. Development is led by Duane Wessels of the - * National Laboratory for Applied Network Research and funded by the - * National Science Foundation. Squid is Copyrighted (C) 1998 by - * the Regents of the University of California. Please see the - * COPYRIGHT file for full details. Squid incorporates software - * developed and/or copyrighted by other sources. Please see the - * CREDITS file for full details. + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -63,6 +63,7 @@ static char *cachemgrPasswdGet(cachemgr_passwd *, const char *); static const char *cachemgrActionProtection(const action_table * at); static OBJH cachemgrShutdown; +static OBJH cachemgrReconfigure; static OBJH cachemgrMenu; static OBJH cachemgrOfflineToggle; @@ -282,6 +283,14 @@ } static void +cachemgrReconfigure(StoreEntry * sentry) +{ + debug(16, 0) ("Reconfigure by command.\n"); + reconfigure(SIGHUP); + storeAppendPrintf(sentry, "Reconfiguring Squid Process ...."); +} + +static void cachemgrOfflineToggle(StoreEntry * sentry) { switch(Config.offline) @@ -350,6 +359,9 @@ cachemgrRegister("shutdown", "Shut Down the Squid Process", cachemgrShutdown, 1, 1); + cachemgrRegister("reconfigure", + "Reconfigure the Squid Process", + cachemgrReconfigure, 1, 1); cachemgrRegister("offline_toggle", "Toggle offline_mode setting", cachemgrOfflineToggle, 1, 1); Index: squid/src/stat.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/stat.c,v retrieving revision 1.1.1.3.4.1.2.6 retrieving revision 1.1.1.3.4.1.2.7 diff -u -r1.1.1.3.4.1.2.6 -r1.1.1.3.4.1.2.7 --- squid/src/stat.c 16 Sep 2001 08:59:53 -0000 1.1.1.3.4.1.2.6 +++ squid/src/stat.c 17 Feb 2002 08:57:57 -0000 1.1.1.3.4.1.2.7 @@ -1,6 +1,6 @@ /* - * $Id: stat.c,v 1.1.1.3.4.1.2.6 2001/09/16 08:59:53 serassio Exp $ + * $Id: stat.c,v 1.1.1.3.4.1.2.7 2002/02/17 08:57:57 serassio Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -483,6 +483,15 @@ runtime = 1.0; storeAppendPrintf(sentry, "Squid Object Cache: Version %s\n", version_string); +#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) + if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { + storeAppendPrintf(sentry,"\nRunning as %s Windows System Service on %s\n", + WIN32_Service_name, WIN32_OS_string); + storeAppendPrintf(sentry,"Service command line is: %s\n", WIN32_Service_Command_Line); + } + else + storeAppendPrintf(sentry,"Running on %s\n",WIN32_OS_string); +#endif storeAppendPrintf(sentry, "Start Time:\t%s\n", mkrfc1123(squid_start.tv_sec)); storeAppendPrintf(sentry, "Current Time:\t%s\n",