@@ -510,10 +510,82 @@
        (start-watchdog (null? no-watchdog-args-vals)))
   ;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals) 
   (if start-watchdog
       (thread-start! *watchdog*)))
 
+;;======================================================================
+;; error handling overrides
+;;======================================================================
+
+(define (std-exit-procedure)
+  ;;(common:telemetry-log-close)
+  (on-exit (lambda () 0))
+  ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*)
+  (let ((no-hurry  (if *time-to-exit* ;; hurry up
+		       #f
+		       (begin
+			 (set! *time-to-exit* #t)
+			 #t))))
+    (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
+    (if (and no-hurry (debug:debug-mode 18))
+	(rmt:print-db-stats))
+    (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
+                              (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
+			      (if *task-db*    
+				  (let ((db (cdr *task-db*)))
+				    (if (sqlite3:database? db)
+					(begin
+					  (sqlite3:interrupt! db)
+					  (sqlite3:finalize! db #t)
+					  ;; (vector-set! *task-db* 0 #f)
+					  (set! *task-db* #f)))))
+                              (http-client#close-all-connections!)
+                              (if (not (eq? *default-log-port* (current-error-port)))
+                                  (close-output-port *default-log-port*))
+			      (set! *default-log-port* (current-error-port))) "Cleanup db exit thread"))
+	  (th2 (make-thread (lambda ()
+			      (debug:print 4 *default-log-port* "Attempting clean exit. Please be patient and wait a few seconds...")
+			      (if no-hurry
+                                  (begin
+                                    (thread-sleep! 5)) ;; give the clean up few seconds to do it's stuff
+                                  (begin
+      				  (thread-sleep! 2)))
+      			      (debug:print 4 *default-log-port* " ... done")
+      			      )
+			    "clean exit")))
+      (thread-start! th1)
+      (thread-start! th2)
+      (thread-join! th1)
+      )
+    )
+
+  0)
+
+(define (std-signal-handler signum)
+  ;; (signal-mask! signum)
+  (set! *time-to-exit* #t) 
+  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
+  (debug:print-error 0 *default-log-port* "Received signal " signum " aaa exiting promptly")
+  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
+  (exit))
+
+(define (special-signal-handler signum)
+  ;; (signal-mask! signum)
+  (set! *time-to-exit* #t)
+  ;;(debug:print-info 13 *default-log-port* "got signal "signum)
+  (debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting!!")
+  ;;TODO send email to notify admin contact listed in the config that the lisner got killed
+  ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway
+  (exit))
+
+
+(set-signal-handler! signal/int  std-signal-handler)  ;; ^C
+(set-signal-handler! signal/term std-signal-handler)
+
+;; (set-signal-handler! signal/stop std-signal-handler)  ;; ^Z NO, do NOT handle ^Z!
+
+;; END ERROR HANDLING OVERRIDES
 
 ;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
 (define (open-logfile logpath)
   (condition-case
    (let* ((log-dir (or (pathname-directory logpath) ".")))
@@ -947,53 +1019,10 @@
              (json-write targets))
             (else
              (debug:print-error 0 *default-log-port* "dump output format " (args:get-arg "-dumpmode") " not supported for -list-targets")))
           (set! *didsomething* #t))))
 
-;; cache the runconfigs in $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME/.runconfig
-;;
-(define (full-runconfigs-read)
-;; in the envprocessing branch the below code replaces the further below code
-;;  (if (eq? *configstatus* 'fulldata)
-;;      *runconfigdat*
-;;      (begin
-;;	(launch:setup)
-;;	*runconfigdat*)))
-
-  (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
-		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
-		     #f))
-	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
-    (if (and cfgf
-	     (common:file-exists? cfgf)
-	     (file-write-access? cfgf)
-	     (common:use-cache?))
-	(configf:read-alist cfgf)
-	(let* ((keys   (rmt:get-keys))
-	       (target (common:args-get-target))
-	       (key-vals (if target (keys:target->keyval keys target) #f))
-	       (sections (if target (list "default" target) #f))
-	       (data     (begin
-			   (setenv "MT_RUN_AREA_HOME" *toppath*)
-			   (if key-vals
-			       (for-each (lambda (kt)
-					   (setenv (car kt) (cadr kt)))
-					 key-vals))
-			   ;; (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
-                           (runconfig:read (conc *toppath* "/runconfigs.config") target #f))))
-	  (if (and rundir ;; have all needed variabless
-		   (directory-exists? rundir)
-		   (file-write-access? rundir))
-	      (begin
-                (if (not (common:in-running-test?))
-                    (configf:write-alist data cfgf))
-		;; force re-read of megatest.config - this resolves circular references between megatest.config
-		(launch:setup force-reread: #t)
-		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
-		)) ;; we can safely cache megatest.config since we have a valid runconfig
-	  data))))
-
 (if (args:get-arg "-show-runconfig")
     (let ((tl (launch:setup)))
       (push-directory *toppath*)
       (let ((data (full-runconfigs-read)))
 	;; keep this one local