Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -473,38 +473,69 @@
 ;;                     remove previous compressed log and compress this log
 ;; WARNING: This proc operates assuming that it is in the directory above the
 ;;          logs directory you wish to log-rotate.
 ;;
 (define (common:rotate-logs)
-  (if (not (directory-exists? "logs"))(create-directory "logs"))
-  (directory-fold 
-   (lambda (file rem)
-     (handle-exceptions
-      exn
-      (debug:print-info 0 *default-log-port* "unable to rotate log " file ", probably handled by another process.")
-      (let* ((fullname (conc "logs/" file))
-             (file-age (- (current-seconds)(file-modification-time fullname))))
-        (if (or (and (string-match "^.*.log" file)
-                     (> (file-size fullname) 200000))
-                (and (string-match "^server-.*.log" file)
-                     (> (- (current-seconds) (file-modification-time fullname))
-                        (* 8 60 60))))
-            (let ((gzfile (conc fullname ".gz")))
-              (if (common:file-exists? gzfile)
-                  (begin
-                    (debug:print-info 0 *default-log-port* "removing " gzfile)
-                    (delete-file gzfile)))
-              (debug:print-info 0 *default-log-port* "compressing " file)
-              (system (conc "gzip " fullname)))
-            (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
-                (handle-exceptions
-                 exn
-                 #f
-                 (delete-file fullname)))))))
-   '()
-   "logs"))
-
+  (let* ((all-files (make-hash-table))
+	 (stats     (make-hash-table))
+	 (inc-stat  (lambda (key)
+		      (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1))))
+	(max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age
+    (if (not (directory-exists? "logs"))(create-directory "logs"))
+    (directory-fold 
+     (lambda (file rem)
+       (handle-exceptions
+	exn
+	(begin
+	  (debug:print-info 0 *default-log-port* "unable to rotate log " file ", probably handled by another process.")
+	  (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	  (print-call-chain (current-error-port)))
+	(let* ((fullname  (conc "logs/" file))
+	       (mod-time  (file-modification-time fullname))
+	       (file-age  (- (current-seconds) mod-time)))
+	  (hash-table-set! all-files file mod-time)
+	  (if (or (and (string-match "^.*.log" file)
+		       (> (file-size fullname) 200000))
+		  (and (string-match "^server-.*.log" file)
+		       (> (- (current-seconds) (file-modification-time fullname))
+			  (* 8 60 60))))
+	      (let ((gzfile (conc fullname ".gz")))
+		(if (common:file-exists? gzfile)
+		    (begin
+		      (debug:print-info 0 *default-log-port* "removing " gzfile)
+		      (delete-file* gzfile)
+		      (hash-table-delete!  all-files gzfile) ;; needed?
+		      ))
+		(debug:print-info 0 *default-log-port* "compressing " file)
+		(system (conc "gzip " fullname))
+		(inc-stat "gzipped")
+		(hash-table-set! all-files (conc file ".gz") file-age)  ;; add the .gz file and remove the base file
+		(hash-table-delete! all-files file)
+		)
+	      (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+		  (handle-exceptions
+		   exn
+		   #f
+		   (delete-file* fullname)
+		   (inc-stat "deleted")
+		   (hash-table-delete! all-files file)))))))
+     '()
+     "logs")
+    (debug:print-info 0 *default-log-port* "Deleted log files: " (hash-table-ref/default stats "deleted" 0))
+    (debug:print-info 0 *default-log-port* "Gzipped log files: " (hash-table-ref/default stats "gzipped" 0))    
+    (let ((num-logs (hash-table-size all-files)))
+      (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
+	  (let ((files (take (sort (hash-table-keys all-files)
+				   (lambda (a b)
+				     (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
+			     (- num-logs max-allowed))))
+	    (for-each
+	     (lambda (file)
+	       (delete-file* (conc "logs/" file)))
+	     files)
+	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " from logs, keeping " max-allowed " files."))))))
+  
 ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
 ;; Do NOT check if not on homehost!
 ;;
 (define (common:exit-on-version-changed)
   (if (common:on-homehost?)