@@ -97,11 +97,12 @@
   -env2file fname         : write the environment to fname.csh and fname.sh
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -server -|hostname      : start the server (reduces contention on megatest.db), use
                             - to automatically figure out hostname
-  -list-servers            : list the servers 
+  -transport http|zmq     : use http or zmq for transport (default is http) 
+  -list-servers           : list the servers 
   -repl                   : start a repl (useful for extending megatest)
 
 Spreadsheet generation
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
@@ -157,10 +158,11 @@
 			":expected"
 			":tol"
 			":units"
 			;; misc
 			"-server"
+			"-transport"
 			"-kill-server"
 			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
@@ -283,23 +285,23 @@
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
 
 (if (args:get-arg "-server")
-    (begin
-      (debug:print 2 "Launching server...")
-      (server:launch)))
+    (let ((transport (args:get-arg "-transport" 'http)))
+      (debug:print 2 "Launching server using transport " transport)
+      (server:launch transport)))
 
 (if (args:get-arg "-list-servers")
 	;; (args:get-arg "-kill-server"))
     (let ((tl (setup-for-run)))
       (if tl 
 	  (let ((servers (open-run-close tasks:get-all-servers tasks:open-db))
-		(fmtstr  "~5a~8a~8a~20a~20a~10a~10a~10a~10a\n")
+		(fmtstr  "~5a~8a~8a~20a~20a~10a~10a~10a~10a~10a\n")
 		(servers-to-kill '()))
-	    (format #t fmtstr "Id" "MTver" "Pid" "Host" "Interface" "OutPort" "InPort" "LastBeat" "State")
-	    (format #t fmtstr "==" "=====" "===" "====" "=========" "=======" "======" "========" "=====")
+	    (format #t fmtstr "Id" "MTver" "Pid" "Host" "Interface" "OutPort" "InPort" "LastBeat" "State" "Transport")
+	    (format #t fmtstr "==" "=====" "===" "====" "=========" "=======" "======" "========" "=====" "=========")
 	    (for-each 
 	     (lambda (server)
 	       (let* (;; (killinfo   (args:get-arg "-kill-server"))
 		      ;; (khost-port (if killinfo (if (substring-index ":" killinfo)(string-split ":") #f) #f))
 		      ;; (kpid       (if killinfo (if (substring-index ":" killinfo) #f (string->number killinfo)) #f))
@@ -312,10 +314,11 @@
 		      (start-time (vector-ref server 6))
 		      (priority   (vector-ref server 7))
 		      (state      (vector-ref server 8))
 		      (mt-ver     (vector-ref server 9))
 		      (last-update (vector-ref server 10)) ;;   (open-run-close tasks:server-alive? tasks:open-db #f hostname: hostname port: port))
+		      (transport  (vector-ref server 11))
 		      (killed     #f)
 		      (status     (< last-update 20)))
 		 ;;   (zmq-sockets (if status (server:client-connect hostname port) #f)))
 		 ;; no need to login as status of #t indicates we are connecting to correct 
 		 ;; server
@@ -324,11 +327,11 @@
 			 (open-run-close tasks:server-deregister tasks:open-db hostname pullport: pullport pid: pid action: 'delete))
 		     (if (> last-update 20)        ;; Mark as dead if not updated in last 20 seconds
 			 (open-run-close tasks:server-deregister tasks:open-db hostname pullport: pullport pid: pid)))
 
 		 (format #t fmtstr id mt-ver pid hostname interface pullport pubport last-update
-			 (if status "alive" "dead"))))
+			 (if status "alive" "dead") transport)))
 	     servers)
 	    (debug:print-info 1 "Done with listservers")
 	    (set! *didsomething* #t)
 	    (exit) ;; must do, would have to add checks to many/all calls below
 	    )