diff --git a/Makefile b/Makefile index de173df..7991022 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MAKEOPTS = $(MAKEOPTS) GIT_COMMIT := $(shell git rev-list -1 HEAD) -VERSION := 0.2.9.2 +VERSION := 0.2.9.3-dev BUILDOPTS :=$(BUILDOPTS) -ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT)" .PHONY: install all clean diff --git a/bacillus.go b/bacillus.go index f177bf8..368521e 100644 --- a/bacillus.go +++ b/bacillus.go @@ -41,6 +41,11 @@ const ( indStyleColour = "colour" ) +type cmdItem struct { + script string + lastStatus int +} + var ( version string = "?" gitCommit string = "00000" @@ -57,7 +62,7 @@ var ( indStyle string instCounter uint32 //runningJobCount uint - cmdMap map[string]string + cmdMap map[string]cmdItem runningJobs runningJobList //map[string]string runningJobsLimit uint //max running jobs demoMode bool // set to true to disable /shutdown and /rudeshutdown @@ -395,8 +400,8 @@ func liveRunLogHTML(tl int) (ret string) { func manualJobTriggersJS() (ret string) { // sort the job keys keys := []string{} - for k := range cmdMap { - keys = append(keys, k) + for jobName, _ := range cmdMap { + keys = append(keys, jobName) } sort.Strings(keys) @@ -404,10 +409,10 @@ func manualJobTriggersJS() (ret string) { // function which will be bound elsewhere to the onclick // event of the job's link in the manual job trigger section // of the page: see manualJobTriggersHTML(). - for _, k := range keys { - if len(cmdMap[k]) > 0 { - fn := strings.Replace(k, "-", "", -1) - ret += xmlHTTPRequester(fn, k, "") + for _, jobName := range keys { + if len(cmdMap[jobName].script) > 0 { + fn := strings.Replace(jobName, "-", "", -1) + ret += xmlHTTPRequester(fn, jobName, "") ret += `