@@ -154,11 +154,11 @@
   ;;(if *dbstruct-db* (db:sync-touched *dbstruct-db* *run-id* force-sync: #t))
   
   (server:remove-dotserver-file *toppath* "anyhost:anyport" force: #t)
   (tasks:server-delete-record (db:delay-if-busy (tasks:open-db)) server-id " rpc-transport:keep-running complete")
   
-
+  (rpc:close-all-connections!)
   ;;(BB> "Before (exit) (from-on-exit="from-on-exit")")
   ;;(unless from-on-exit (exit))  ;; sometimes we hang (around) here with 100% cpu.
   ;;(BB> "After")
   ;; strace reveals endless:
   ;; getrusage(RUSAGE_SELF, {ru_utime={413, 917868}, ru_stime={0, 60003}, ...}) = 0
@@ -276,10 +276,11 @@
   ;;(BB> "entered rpc-transport:client-api-send-receive with run-id="run-id " serverdat="serverdat" cmd="cmd" params="params" numretries="numretries)
   (if (not (vector? serverdat))
       (begin
         (BB> "WHAT?? for run-id="run-id", serverdat="serverdat)
         (print-call-chain)
+        (rpc:close-all-connections!)
         (exit 1)))
   (let* ((iface (rpc-transport:server-dat-get-iface serverdat))
          (port  (rpc-transport:server-dat-get-port serverdat))
          (res #f)
          (api-exec (rpc-transport:get-api-exec iface port))  ;; chached by host/port. may need to clear...
@@ -307,10 +308,11 @@
          (time-out-reached #f)
          (time-out     (lambda ()
 			      (thread-sleep! 45)
                               (set! time-out-reached #t)
                               (thread-terminate! th1)
+                              
 			      #f))
 
          (th2 (make-thread time-out     "time out")))
 	 (thread-start! th1)
 	 (thread-start! th2)