@@ -324,12 +324,28 @@
 ;; no elegance here ...
 ;;
 (define (tasks:kill-server hostname pid)
   (debug:print-info 0 "Attempting to kill server process " pid " on host " hostname)
   (setenv "TARGETHOST" hostname)
-  (system (conc "nbfake kill " pid)))
+  (setenv "TARGETHOST_LOGF" "server-kills.log")
+  (system (conc "nbfake kill " pid))
+  (unsetenv "TARGETHOST_LOGF")
+  (unsetenv "TARGETHOST"))
  
+;; look up a server by run-id and send it a kill, also delete the record for that server
+;;
+(define (tasks:kill-server-run-id run-id)
+  (let* ((tdb  (tasks:open-db))
+	 (sdat (tasks:get-server mdb run-id)))
+    (if sdat
+	(let ((hostname (vector-ref sdat 6))
+	      (pid      (vector-ref sdat 5)))
+	  (debug:print-info 0 "Killing server for run-id " run-id " on host " hostname " with pid " pid)
+	  (tasks:kill-server hostname pid)
+	  (tasks:server-delete-record mdb server-id tag) )
+	(debug:print-info 0 "No server found for run-id " run-id ", nothing to kill"))))
+    
 ;;   (if status ;; #t means alive
 ;;       (begin
 ;; 	(if (equal? hostname (get-host-name))
 ;; 	    (handle-exceptions
 ;; 	     exn