@@ -507,19 +507,19 @@
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
 
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define *watchdog* (make-thread
-		    (lambda ()
-		      (handle-exceptions
-			  exn
-			  (begin
-			    (print-call-chain)
-			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-			(common:watchdog)))
-		    "Watchdog thread"))
+;;(define *watchdog* (make-thread
+;;		    (lambda ()
+;;		      (handle-exceptions
+;;			  exn
+;;			  (begin
+;;			    (print-call-chain)
+;;			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+;;			(common:watchdog)))
+;;		    "Watchdog thread"))
 
 ;;(if (not (args:get-arg "-server"))
 ;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
 (let* ((no-watchdog-args
        '("-list-runs"
@@ -547,12 +547,14 @@
                                                  (loop (car tail) (cdr tail))))))      
        (no-watchdog-args-vals (filter (lambda (x) x)
                                       (map args:get-arg no-watchdog-args)))
        (start-watchdog (and (null? no-watchdog-args-vals) start-watchdog-specail-arg-val)))
        ;(print  "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-specail-arg-val:" start-watchdog-specail-arg-val " start-watchdog:" start-watchdog) 
-  (if start-watchdog
-      (thread-start! *watchdog*)))
+;;  (if start-watchdog
+;;      (thread-start! *watchdog*))
+    #t
+)
 
 
 ;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
 (define (open-logfile logpath-in)
   (condition-case
@@ -2479,12 +2481,12 @@
   ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
   (set! *didsomething* #t))
 
 (if (args:get-arg "-sync-to-megatest.db")
     (let* ((duh      (launch:setup))
-	   (dbstruct (db:setup #f))
-	   (tmpdbpth (cdr (dbr:dbstruct-tmpdb dbstruct)))
+	   (dbstruct (db:setup #t))
+	   (tmpdbpth (dbr:dbstruct-tmppath dbstruct))
 	   (lockfile (conc tmpdbpth ".lock"))
 	   (locked   (common:simple-file-lock lockfile)) 
 	   (res      (if locked
 			 (db:multi-db-sync 
 			  dbstruct
@@ -2550,14 +2552,14 @@
 ;;(debug:print-info 13 *default-log-port* "thread-join! watchdog")
 
 ;; join the watchdog thread if it has been thread-start!ed  (it may not have been started in the case of a server that never enters running state)
 ;;   (symbols returned by thread-state: created ready running blocked suspended sleeping terminated dead)
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(if (thread? *watchdog*)
-    (case (thread-state *watchdog*)
-      ((ready running blocked sleeping terminated dead)
-       (thread-join! *watchdog*))))
+;;(if (thread? *watchdog*)
+;;    (case (thread-state *watchdog*)
+;;      ((ready running blocked sleeping terminated dead)
+;;       (thread-join! *watchdog*))))
 
 (set! *time-to-exit* #t)
 
 (if (not (eq? *globalexitstatus* 0))
     (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall"))