Index: http-transportmod.scm
==================================================================
--- http-transportmod.scm
+++ http-transportmod.scm
@@ -666,17 +666,37 @@
 
     (let loop ((count         0)
 	       (server-state 'available)
 	       (bad-sync-count 0)
 	       (start-time     (current-milliseconds)))
-      ;; Use this opportunity to sync the tmp db to megatest.db
+      ;; Use this opportunity to sync the tmp db to megatest.db NOTE: This conflicts with the watchdog syncing?
       (if (not *dbstruct-db* )
 	  (let ((watchdog (bdat-watchdog *bdat*)))
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
 	    
 	    (db:setup dbname) ;; sets *dbstruct-db* as side effect
+	    ;; NOW REGISTER THE SERVER in main.db
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+	    
+	    
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
 	    (if watchdog
 		(if (not (member (thread-state watchdog) '(ready running blocked sleeping dead)))
 		    (begin
 		      (debug:print-info 0 *default-log-port* "Starting watchdog thread (in state "(thread-state watchdog)")")

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -650,11 +650,10 @@
   (let* ((run-id (rmt:send-receive 'register-run #f (list keyvals runname state status user contour))))
     ;; now register in the run db itself
     (rmt:send-receive 'register-run run-id (list keyvals runname state status user contour))
     run-id))
   
-    
 (define (rmt:get-run-name-from-id run-id)
   (rmt:send-receive 'get-run-name-from-id run-id (list run-id)))
 
 (define (rmt:delete-run run-id)
   (rmt:send-receive 'delete-run run-id (list run-id)))