@@ -103,20 +103,20 @@
    pubport
    transport
    ))
 
 ;; NB// two servers with same pid on different hosts will be removed from the list if pid: is used!
-(define (tasks:server-deregister mdb hostname #!key (port #f)(pid #f)(action 'markdead))
+(define (tasks:server-deregister mdb hostname #!key (port #f)(pid #f)(action 'delete))
   (debug:print-info 11 "server-deregister " hostname ", port " port ", pid " pid)
   (if pid
       (case action
 	((delete)(sqlite3:execute mdb "DELETE FROM servers WHERE pid=?;" pid))
 	(else    (sqlite3:execute mdb "UPDATE servers SET state='dead' WHERE pid=?;" pid)))
       (if port
 	  (case action
-	    ((delete)(sqlite3:execute mdb "DELETE FROM servers WHERE  hostname=? AND port=?;" hostname port))
-	    (else    (sqlite3:execute mdb "UPDATE servers SET state='dead' WHERE hostname=? AND port=?;" hostname port)))
+	    ((delete)(sqlite3:execute mdb "DELETE FROM servers WHERE (interface=? or hostname=?) AND port=?;" hostname hostname port))
+	    (else    (sqlite3:execute mdb "UPDATE servers SET state='dead' WHERE (interface=? or hostname=?) AND port=?;" hostname hostname port)))
 	  (debug:print 0 "ERROR: tasks:server-deregister called with neither pid nor port specified"))))
 
 (define (tasks:server-deregister-self mdb hostname)
   (tasks:server-deregister mdb hostname pid: (current-process-id)))
 
@@ -141,11 +141,11 @@
 	 "SELECT id FROM servers WHERE pid=-999;")))
      (if hostname hostname iface)(if pid pid port))
     res))
 
 (define (tasks:server-update-heartbeat mdb server-id)
-  (debug:print-info 0 "Heart beat update of server id=" server-id)
+  (debug:print-info 1 "Heart beat update of server id=" server-id)
   (sqlite3:execute mdb "UPDATE servers SET heartbeat=strftime('%s','now') WHERE id=?;" server-id))
 
 ;; alive servers keep the heartbeat field upto date with seconds every 6 or so seconds
 (define (tasks:server-alive? mdb server-id #!key (iface #f)(hostname #f)(port #f)(pid #f))
   (let* ((server-id  (if server-id 
@@ -250,17 +250,17 @@
 	     (process-signal pid signal/term)
 	     (thread-sleep! 5) ;; give it five seconds to die peacefully then do a brutal kill
 	     ;;(process-signal pid signal/kill)
 	     ) ;; local machine, send sig term
 	    (begin
-		(debug:print-info 1 "Stopping remote servers not yet supported."))))
-	;;      (debug:print-info 1 "Telling alive server on " hostname ":" port " to commit servercide")
-	;;      (let ((serverdat (list hostname port)))
-	;;	(case (string->symbol transport)
-	;;	  ((http)(http-transport:client-connect hostname port))
-	;;	  (else  (debug:print "ERROR: remote stopping servers of type " transport " not supported yet")))
-	;;	(cdb:kill-server serverdat)))))    ;; remote machine, try telling server to commit suicide
+	      ;;(debug:print-info 1 "Stopping remote servers not yet supported."))))
+	      (debug:print-info 1 "Telling alive server on " hostname ":" port " to commit servercide")
+	      (let ((serverdat (list hostname port)))
+	      	(case (if (string? transport) (string->symbol transport) transport)
+	      	  ((http)(http-transport:client-connect hostname port))
+	      	  (else  (debug:print "ERROR: remote stopping servers of type " transport " not supported yet")))
+	      	(cdb:kill-server serverdat pid)))))    ;; remote machine, try telling server to commit suicide
       (begin
 	(if status 
 	    (if (equal? hostname (get-host-name))
 		(begin
 		  (debug:print-info 1 "Sending signal/term to " pid " on " hostname)