Fixed storeDirSwapLog problems upon reconfigure

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 44d1b25fe1fbe583e6a97d2753b76931168a3409..f1bee2a5ad2b7fbfe01f618f079aa014a5561c5c 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.228 1997/10/28 21:53:35 wessels Exp $
+ * $Id: cache_cf.cc,v 1.229 1997/11/04 23:29:35 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -476,7 +476,6 @@ parse_cachedir(struct _cacheSwap *swap)
        xfree(swap->swapDirs);
        swap->swapDirs = tmp;
     }
-    debug(20, 1) ("Creating Swap Dir #%d in %s\n", swap->n_configured + 1, path);
     tmp = swap->swapDirs + swap->n_configured;
     tmp->path = xstrdup(path);
     tmp->max_size = size;

diff --git a/src/main.cc b/src/main.cc
index aa230fff165a49206b39e6033937dc56d8706665..08ce9dd0d6fb4fd8745ce1aede10aae54d714b48 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.187 1997/11/03 20:04:44 wessels Exp $
+ * $Id: main.cc,v 1.188 1997/11/04 23:29:36 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -462,6 +462,7 @@ mainReconfigure(void)
 {
     debug(1, 0) ("Restarting Squid Cache (version %s)...\n", version_string);
     /* Already called serverConnectionsClose and ipcacheShutdownServers() */
+    storeDirCloseSwapLogs();
     parseConfigFile(ConfigFile);
     _db_init(Config.Log.log, Config.debugOptions);
     ipcache_restart();         /* clear stuck entries */
@@ -471,6 +472,7 @@ mainReconfigure(void)
     serverConnectionsOpen();
     if (theOutIcpConnection >= 0 && (!Config2.Accel.on || Config.onoff.accel_with_proxy))
        neighbors_open(theOutIcpConnection);
+    storeDirOpenSwapLogs();
     debug(1, 0) ("Ready to serve requests.\n");
 }