Index: megatest.config ================================================================== --- megatest.config +++ megatest.config @@ -49,12 +49,12 @@ [access] ext matt:admin mattw:owner [accesstypes] -admin run rerun resume remove set-ss -owner run rerun resume remove +admin run rerun resume remove set-ss rerun-clean +owner run rerun resume remove rerun-all badguy set-ss [setup] maxload 1.2 Index: mtut.scm ================================================================== --- mtut.scm +++ mtut.scm @@ -237,10 +237,17 @@ (sync . "") (archive . "-archive") (set-ss . "-set-state-status") (remove . "-remove-runs"))) +;; manually keep this list updated from the keys to +;; the case *action* near the end of this file. +(define *other-actions* + '(run remove rerun set-ss archive kill list + dispatch import rungen process + show gendot db tsend tlisten)) + ;; Card types: ;; ;; A action ;; U username (Unix) ;; D timestamp @@ -1185,11 +1192,11 @@ (if (common:file-exists? debugcontrolf) (load debugcontrolf))) (if *action* (case (string->symbol *action*) - ((run remove rerun set-ss archive kill list) + ((run remove rerun rerun-clean rerun-all set-ss archive kill list) (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir"))) (mtconf (car mtconfdat)) (area (args:get-arg "-area")) ;; look up the area to dispatch to from [areas] section (areasec (if area (configf:lookup mtconf "areas" area) #f)) (areadat (if areasec (common:val->alist areasec) #f)) @@ -1328,11 +1335,14 @@ (let loop ((instr (nn-recv rep))) (print "received " instr ", running \"" script " " instr "\"") (system (conc script " '" instr "'")) (nn-send rep "ok") (loop (nn-recv rep)))) - (print "ERROR: Port " portnum " already in use. Try another port"))))))) + (print "ERROR: Port " portnum " already in use. Try another port"))))))) + (else + (let ((all-actions (sort (map conc (delete-duplicates (append *other-actions* (map car *action-keys*)))) string<=?))) + (print "unrecognised action: \"" *action* "\", try one of; \"" (string-intersperse all-actions "\", \"") "\""))) )) ;; the end ;; If HTTP_HOST is defined then we must be in the cgi environment