Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -504,26 +504,29 @@
 	 (server-start        (conc tmp-area "/.server-start"))
 	 (server-started      (conc tmp-area "/.server-started"))
 	 (start-time          (common:lazy-modification-time server-start))
 	 (started-time        (common:lazy-modification-time server-started))
 	 (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
-	 (start-time-old      (> (- (current-seconds) start-time) 5)))
+	 (start-time-old      (> (- (current-seconds) start-time) 5))
+         (cleanup-proc        (lambda (msg)
+                                (let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
+                                       (full-serv-fname (conc *toppath* "/logs/" serv-fname))
+                                       (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
+                                  (debug:print 0 *default-log-port* msg)
+                                  (if (common:file-exists? full-serv-fname)
+                                      (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname))
+                                      (debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
+                                  (exit)))))
     (if (and (not start-time-old) ;; last server start try was less than five seconds ago
 	     (not server-starting))
 	(begin
-	  (debug:print-info 0 *default-log-port* "NOT starting server, there is either a recently started server or a server in process of starting")
+	  (cleanup-proc "NOT starting server, there is either a recently started server or a server in process of starting")
 	  (exit))))
   ;; lets not even bother to start if there are already three or more server files ready to go
   (let* ((num-alive   (server:get-num-alive (server:get-list *toppath*))))
     (if (> num-alive 3)
-	(let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
-               (full-serv-fname (conc *toppath* "/logs/" serv-fname))
-               (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
-	  (debug:print 0 *default-log-port* "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up")
-          (if (common:file-exists? serv-fname)
-              (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname)))
-	  (exit))))
+        (cleanup-proc "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up")))
   (let* ((th2 (make-thread (lambda ()
 			     (debug:print-info 0 *default-log-port* "Server run thread started")
 			     (http-transport:run 
 			      (if (args:get-arg "-server")
 				  (args:get-arg "-server")