@@ -264,17 +264,17 @@
     (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
 	       (args:get-arg "-server"))
       
       (let loop ()
 	(do-a-sync)
-        (if (not *time-to-exit*) (loop))) ;; keep going unless time to exit
+        (if (not (bdat-time-to-exit *bdat*)) (loop))) ;; keep going unless time to exit
 
       ;; time to exit, close the no-sync db here
       (final-sync)
 
       (if (common:low-noise-print 30)
-	  (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)
+	  (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = "(bdat-time-to-exit *bdat*)" pid="(current-process-id)
 			    )))))
 
 (define (server:writable-watchdog-deltasync dbstruct)
   (thread-sleep! 0.054) ;; delay for startup
   (let ((legacy-sync  (common:run-sync?))
@@ -286,11 +286,11 @@
         (sync-duration 0) ;; run time of the sync in milliseconds
         )
     (set! *no-sync-db* no-sync-db) ;; make the no sync db available to api calls
     (debug:print-info 2 *default-log-port* "Periodic sync thread started.")
     (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
-    (if (and legacy-sync (not *time-to-exit*))
+    (if (and legacy-sync (not (bdat-time-to-exit *bdat*)))
 	(let* (;;(dbstruct (db:setup))
 	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
 	       (mtpath     (db:dbdat-get-path mtdb))
 	       (tmp-area   (common:get-db-tmp-area))
 	       (start-file (conc tmp-area "/.start-sync"))
@@ -301,11 +301,11 @@
 	    ;;
 	    (mutex-lock! *db-multi-sync-mutex*)
 	    (let* ((need-sync        (>= *db-last-access* *db-last-sync*)) ;; no sync since last write
 		   (sync-in-progress *db-sync-in-progress*)
                    (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 5))
-		   (should-sync      (and (not *time-to-exit*)
+		   (should-sync      (and (not (bdat-time-to-exit *bdat*))
                                           (> (- (current-seconds) *db-last-sync*) min-intersync-delay))) ;; sync every five seconds minimum, deprecated logic, can probably be removed
 		   (start-time       (current-seconds))
                    (cpu-load-adj     (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
 		   (mt-mod-time      (file-modification-time mtpath))
 		   (last-sync-start  (if (common:file-exists? start-file)
@@ -317,11 +317,11 @@
                    (sync-period      (+ 3 (* cpu-load-adj 30))) ;; as adjusted load increases increase the sync period
 		   (recently-synced  (and (< (- start-time mt-mod-time) sync-period) ;; not useful if sync didn't modify megatest.db!
 					  (< mt-mod-time last-sync-start)))
 		   (sync-done        (<= last-sync-start last-sync-end))
                    (sync-stale       (> start-time (+ last-sync-start sync-stale-seconds)))
-		   (will-sync        (and (not *time-to-exit*)       ;; do not start a sync if we are in the process of exiting
+		   (will-sync        (and (not (bdat-time-to-exit *bdat*))       ;; do not start a sync if we are in the process of exiting
                                           (or need-sync should-sync)
 					  (or sync-done sync-stale)
 					  (not sync-in-progress)
 					  (not recently-synced))))
               (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop.  need-sync="need-sync" sync-in-progress=" sync-in-progress
@@ -390,20 +390,20 @@
 		    (set! last-time start-time)
 		    (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
 	    
 	    ;; keep going unless time to exit
 	    ;;
-	    (if (not *time-to-exit*)
+	    (if (not (bdat-time-to-exit *bdat*))
 		(let delay-loop ((count 0))
-                  ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*)
+                  ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="(bdat-time-to-exit *bdat*))
                                                             
-		  (if (and (not *time-to-exit*)
+		  (if (and (not (bdat-time-to-exit *bdat*))
 			   (< count 6)) ;; was 11, changing to 4. 
 		      (begin
 			(thread-sleep! 1)
 			(delay-loop (+ count 1))))
-		  (if (not *time-to-exit*) (loop))))
+		  (if (not (bdat-time-to-exit *bdat*)) (loop))))
 	    ;; time to exit, close the no-sync db here
 	    (db:no-sync-close-db no-sync-db stmt-cache)
 	    (if (common:low-noise-print 30)
-		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))
+		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " (bdat-time-to-exit *bdat*)" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))