@@ -307,20 +307,21 @@ ;; NEED TIMESTAMP ON PKTS for efficient loading of packets into db. ;; make a run request pkt from basic data ;; -(define (create-run-pkt mtconf area runkey runname mode-patt tag-expr pktsdir reason) +(define (create-run-pkt mtconf area runkey runname mode-patt tag-expr pktsdir reason contour) (let ((area-path (configf:lookup mtconf "areas" area))) (let-values (((uuid pkt) (command-line->pkt "run" (append `(("-target" . ,runkey) ("-run-name" . ,runname) ("-start-dir" . ,area-path) - ("-msg" . ,reason)) + ("-msg" . ,reason) + ("-contour" . ,contour)) (if mode-patt `(("-mode-patt" . ,mode-patt)) '()) (if tag-expr `(("-tag-expr" . ,tag-expr)) @@ -399,22 +400,22 @@ ;; now have torun populated (for-each (lambda (contour) (let* ((mode-tag (string-split (or (configf:lookup mtconf "contours" contour) "") "/")) - (tag-expr (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)) - (mode-patt (if (null? mode-tag) #f (car mode-tag)))) + (mode-patt (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)) + (tag-expr (if (null? mode-tag) #f (car mode-tag)))) (for-each (lambda (runkeydat) (let* ((runkey (car runkeydat)) (info (cadr runkeydat))) (for-each (lambda (area) (let ((runname (cadr info)) (reason (car info))) (print "runkey: " runkey " contour: " contour " info: " info " area: " area " tag-expr: " tag-expr " mode-patt: " mode-patt) - (create-run-pkt mtconf area runkey runname mode-patt tag-expr pktsdir reason))) + (create-run-pkt mtconf area runkey runname mode-patt tag-expr pktsdir reason contour))) areas))) (configf:get-section torun contour)))) (hash-table-keys torun)))))) @@ -487,15 +488,20 @@ ;; (hash-table-delete! adjargs key))) ;; we need to delete any params intended for mtutil ;; (hash-table-keys adjargs)) (let-values (((uuid pkt) (command-line->pkt *action* adjargs))) (write-pkt pktsdir uuid pkt)))) - ((dispatch import rungen) + ((dispatch import rungen process) (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir"))) (mtconf (car mtconfdat)) (toppath (configf:lookup mtconf "dyndat" "toppath"))) (case (string->symbol *action*) + ((process) (begin + (load-pkts-to-db mtconf) + (generate-run-pkts mtconf toppath) + (load-pkts-to-db mtconf) + (dispatch-commands mtconf toppath))) ((import) (load-pkts-to-db mtconf)) ;; import pkts ((rungen) (generate-run-pkts mtconf toppath)) ((dispatch) (dispatch-commands mtconf toppath))))))) (if (or (args:get-arg "-repl")