@@ -116,23 +116,23 @@
 
     (set! *cache-on* #t)
 
     ;; what to do when we quit
     ;;
-    (on-exit (lambda ()
-	       (if (and *toppath* *server-info*)
-		   (open-run-close tasks:server-deregister-self tasks:open-db (car *server-info*))
-		   (let loop () 
-		     (let ((queue-len 0))
-		       (thread-sleep! (random 5))
-		       (mutex-lock! *incoming-mutex*)
-		       (set! queue-len (length *incoming-data*))
-		       (mutex-unlock! *incoming-mutex*)
-		       (if (> queue-len 0)
-			   (begin
-			     (debug:print-info 0 "Queue not flushed, waiting ...")
-			     (loop))))))))
+;;     (on-exit (lambda ()
+;; 	       (if (and *toppath* *server-info*)
+;; 		   (open-run-close tasks:server-deregister-self tasks:open-db (car *server-info*))
+;; 		   (let loop () 
+;; 		     (let ((queue-len 0))
+;; 		       (thread-sleep! (random 5))
+;; 		       (mutex-lock! *incoming-mutex*)
+;; 		       (set! queue-len (length *incoming-data*))
+;; 		       (mutex-unlock! *incoming-mutex*)
+;; 		       (if (> queue-len 0)
+;; 			   (begin
+;; 			     (debug:print-info 0 "Queue not flushed, waiting ...")
+;; 			     (loop))))))))
 
     ;; The heavy lifting
     ;;
     ;; make-vector-record cdb packet client-sig qtype immediate query-sig params qtime
     ;;
@@ -140,11 +140,11 @@
       (let* ((rawmsg (receive-message* pull-socket))
 	     (packet (db:string->obj rawmsg)))
 	(debug:print-info 12 "server=> received packet=" packet)
 	(if #t ;; (cdb:packet-get-immediate packet) ;; process immediately or put in queue
 	    (begin
-	      (db:process-queue pub-socket (cons packet queue-lst))
+	      (open-run-close db:process-queue #f pub-socket (cons packet queue-lst))
 	      (loop '()))
 	    (loop (cons packet queue-lst)))))))
 
 (define (server:reply pubsock target query-sig success/fail result)
   (debug:print-info 11 "server:reply target=" target ", result=" result)
@@ -240,10 +240,15 @@
   (message-digest-string (md5-primitive) 
 			 (with-output-to-string
 			   (lambda ()
 			     (write (list (current-directory)
 					  (argv)))))))
+
+;;======================================================================
+;; S E R V E R   U T I L I T I E S 
+;;======================================================================
+
 
 ;;======================================================================
 ;; C L I E N  T S
 ;;======================================================================
 
@@ -364,16 +369,16 @@
 		   ;;      		 (server:self-ping server-info)
 		   ;;      		 ))
 		   ;;      	     "Self ping"))
 		   (th2 (make-thread (lambda ()
 				       (server:run (args:get-arg "-server"))) "Server run"))
-		   (th3 (make-thread (lambda ()(server:keep-running)) "Keep running"))
+		   ;; (th3 (make-thread (lambda ()(server:keep-running)) "Keep running"))
 		   )
 	      (set! *client-non-blocking-mode* #t)
 	      ;; (thread-start! th1)
 	      (thread-start! th2)
-	      (thread-start! th3)
+	      ;; (thread-start! th3)
 	      (set! *didsomething* #t)
 	      ;; (thread-join! th3)
 	      (thread-join! th2)
 	      )
 	    (debug:print 0 "ERROR: Failed to setup for megatest")))