Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -43,11 +43,11 @@
 
 (include "common_records.scm")
 
 (define (remove-files filespec)
   (let ((files (glob filespec)))
-    (for-each delete-file files)))
+    (for-each delete-file* files)))
 
 (define (stop-the-train)
   (thread-start! (make-thread (lambda ()
 				(let loop ()
 				  (if (and *toppath*

Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -494,11 +494,11 @@
 				     (sqlite3:execute db (conc "PRAGMA journal_mode = "journal-mode";")))
 				 (if (and init-proc (or force-init
 							(not db-exists)))
 				     (init-proc db))
 				 db))
-			     expire-time: 5)
+			     expire-time: 30)
                             (begin
 			      (if (file-exists? fname )
                                   (let ((db (sqlite3:open-database fname)))
 				    ;; pragmas synchronous not needed because this db is used read-only
 				    ;; (sqlite3:execute db (conc "PRAGMA synchronous = "mode";")
@@ -1572,11 +1572,11 @@
                 #f 
                 (with-input-from-file fname
 	  	  (lambda ()
 		    (equal? key-string (read-line)))))
               (begin
-                 (dbfile:print-err "dbfile:simple-file-lock created " fname " but it was gone 3 seconds later")
+                (dbfile:print-err "dbfile:simple-file-lock created " fname " but it was gone 0.25 seconds later")
 	         #f
               )
           )
        )
     )

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -934,11 +934,11 @@
 		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
 			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash))
 			(rconfig  (conc fulldir "/.runconfig." megatest-version "-" megatest-fossil-hash)))
 		    (if (common:file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
 			(begin
-			  (debug:print-info 0 *default-log-port* "Caching megatest.config in " tmpfile)
+			  (debug:print-info 2 *default-log-port* "Caching megatest.config in " tmpfile)
                           (if (not (common:in-running-test?))
                               (configf:write-alist *configdat* tmpfile))
 			  (system (conc "ln -sf " tmpfile " " targfile))))
 		    )))
 	    (debug:print-info 1 *default-log-port* "No linktree yet, no caching configs.")))))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -18,6 +18,6 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 ;; (declare (unit megatest-version))
 
-(define megatest-version 1.8028)
+(define megatest-version 1.8031)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -111,11 +111,17 @@
 
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
 ;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (common:file-exists? debugcontrolf)
-      (load debugcontrolf)))
+    (begin
+      ;; for some reason, debug:print does not work here. Had to use print.
+      (print (conc "WARNING: loading " debugcontrolf))
+      (load debugcontrolf)
+    )
+  )
+)
 
 ;; usage logging, careful with this, it is not designed to deal with all real world challenges!
 ;;
 (if (and *usage-log-file*
          (file-write-access? *usage-log-file*))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -63,11 +63,12 @@
 (import debugprint dbmod)
 
 ;; lsof -i
 
 (define (portlogger:open-db fname)
-  (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
+  (let* (;; (avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
+         (avail #t)
 	 (exists   (file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
@@ -92,12 +93,12 @@
             fail_count INTEGER DEFAULT 0,
             update_time TIMESTAMP DEFAULT (strftime('%s','now')) );")
     db))
 
 (define (portlogger:open-run-close proc . params)
-  (let* ((fname  (conc "/tmp/." (current-user-name) "-portlogger.db"))
-	 (avail  (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
+  (let* ((fname  (conc "/tmp/." (current-user-name) "-portlogger.db")))
+	 ;; (avail  (tasks:wait-on-journal fname 10))) ;; wait up to about 10 seconds for the journal to go away
     (handle-exceptions
      exn
      (begin
        ;; (release-dot-lock fname)
        (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2918,11 +2918,11 @@
 	      (fld (car  key))
 	      (val (configf:lookup test-conf "test_meta" fld)))
 	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
 	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
 	     (begin
-	       (debug:print 0 *default-log-port* "Updating " test-name " " fld " to " val)
+	       (debug:print 2 *default-log-port* "Updating " test-name " " fld " to " val)
 	       (rmt:testmeta-update-field test-name fld val)))))
      '(("author" 2)("owner" 3)("description" 4)("reviewed" 5)("tags" 9)("jobgroup" 10)))))
 
 ;; find tests with matching tags, tagpatt is a string "tagpatt1,tagpatt2%, ..."
 ;;

Index: tcp-transportmod.scm
==================================================================
--- tcp-transportmod.scm
+++ tcp-transportmod.scm
@@ -716,11 +716,11 @@
     ;; filter the files here by looking in processes table (if we are not main.db)
     ;; and or look at the time stamp on the servinfo file, a running server will
     ;; touch the file every minute (again, this will only apply for main.db)
     (for-each (lambda (fname)
 		(let* ((age (- (current-seconds)(file-modification-time fname))))
-		  (if (> age 200) ;; can't trust it if over 200 seconds old
+		  (if (> age (tt-server-timeout-param)) ;; can't trust it if over server timeout old.
 		      (begin
 			(debug:print 0 *default-log-port* "WARNING: removing stale servinfo file "fname", it is "age" seconds old")
 			(handle-exceptions
 			 exn
 			 (debug:print 0 *default-log-port* "WARNING: error attempting to remove stale servinfo file "fname)
@@ -728,17 +728,15 @@
 		      (set! goodfiles (cons fname goodfiles)))))
 	      sfiles)
     goodfiles))
 
 ;; given a path to a server info file return: host port startseconds server-id pid dbfname logf
-;; example of what it's looking for in the log file:
+;; example of what it's looking for in the file:
 ;;     SERVER STARTED: 10.38.175.67:50216 AT 1616502350.0 server-id: 4907e90fc55c7a09694e3f658c639cf4 
 ;;
 (define (tt:server-get-info logf)
   (let ((server-rx    (regexp "^SERVER STARTED: (\\S+):(\\d+) AT ([\\d\\.]+) server-id: (\\S+) pid: (\\d+) dbfname: (\\S+)")) ;; SERVER STARTED: host:port AT timesecs server id
-        (dbprep-rx    (regexp "^SERVER: dbprep"))
-        (dbprep-found 0)
 	(bad-dat      (list #f #f #f #f #f #f logf)))
      (let ((fdat     (handle-exceptions
 			 exn
 		       (begin
 			 ;; BUG, TODO: add err checking, for now blanket ignore the errors?
@@ -749,13 +747,11 @@
        (if (null? fdat) ;; bad data, return bad-dat
 	   bad-dat
 	   (let loop ((inl  (car fdat))
 		      (tail (cdr fdat))
 		      (lnum 0))
-	     (let ((mlst (string-match server-rx inl))
-		   (dbprep (string-match dbprep-rx inl)))
-	       (if dbprep (set! dbprep-found 1))
+	     (let ((mlst (string-match server-rx inl)))
 	       (if (not mlst)
 		   (if (> lnum 500) ;; give up if more than 500 lines of server log read
 		       bad-dat
 		       (if (null? tail)
 			   bad-dat
@@ -913,18 +909,20 @@
     (debug:print 2 *default-log-port* "setup-listener-portlogger got port " port)
     (handle-exceptions
 	exn
       (if (< port 65535)
 	  (begin
+            (debug:print 0 *default-log-port* "setup-listener-portlogger: exception finding port. Retrying")
 	    (portlogger:open-run-close portlogger:set-failed port)
 	    (thread-sleep! 0.25)
 	    (setup-listener-portlogger uconn))
           (begin
-            (debug:print 0 *default-log-port* "setup-listener-portlogger: could not get a port")
+            (assert #t "setup-listener-portlogger: could not get a port")
 	    #f
           )
       )
+      (debug:print 2 *default-log-port* "setup-listener-portlogger: got port " port)
       (connect-listener uconn port))))
 
 (define (connect-listener uconn port)
   ;; (tcp-listener-socket LISTENER)(socket-name so)
   ;; sockaddr-address, sockaddr-port, sockaddr->string

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -1638,11 +1638,11 @@
 		(if (and testexists
 			 cache-file
 			 (file-write-access? cache-path)
 			 allow-write-cache)
 		    (let ((tpath (conc cache-path "/.testconfig")))
-		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
+		      (debug:print-info 2 *default-log-port* "Caching testconfig for " test-name " in " tpath)
                       (if (and tcfg (not (common:in-running-test?)))
                           (configf:write-alist tcfg tpath))))
 		tcfg))))))
   
 ;; sort tests by priority and waiton