stop

models/cloudbrain.go

@@ -230,6 +230,11 @@ type CommitImageResult struct {
 	Payload map[string]interface{}	`json:"payload"`
 }
 
+type StopJobResult struct {
+	Code    string					`json:"code"`
+	Msg     string					`json:"msg"`
+}
+
 func Cloudbrains(opts *CloudbrainsOptions) ([]*Cloudbrain, int64, error) {
 	sess := x.NewSession()
 	defer sess.Close()

modules/cloudbrain/resty.go

@@ -181,3 +181,34 @@ sendjob:
 
 	return &result, nil
 }
+
+func StopJob(jobID string) error {
+	checkSetting()
+	client := getRestyClient()
+	var result models.StopJobResult
+
+	retry := 0
+
+sendjob:
+	res, err := client.R().
+		SetHeader("Content-Type", "application/json").
+		SetAuthToken(TOKEN).
+		SetResult(&result).
+		Delete(HOST + "/rest-server/api/v1/jobs/" + jobID)
+
+	if err != nil {
+		return fmt.Errorf("resty StopJob: %v", err)
+	}
+
+	if result.Code == "S401" && retry < 1 {
+		retry++
+		_ = loginCloudbrain()
+		goto sendjob
+	}
+
+	if result.Code != Success {
+		return fmt.Errorf("StopJob err: %s", res.String())
+	}
+
+	return nil
+}

routers/repo/cloudbrain.go

@@ -213,6 +213,17 @@ func CloudBrainCommitImage(ctx *context.Context) {
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain")
 }
 
+func CloudBrainStop(ctx *context.Context) {
+	var jobID = ctx.Params(":jobid")
+	err := cloudbrain.StopJob(jobID)
+	if err != nil {
+		log.Error("StopJob failed:", err.Error())
+		return
+	}
+
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain")
+}
+
 func downloadCode(repo *models.Repository, codePath string) error {
 	/*
 	if err := git.Clone(repo.RepoPath(), codePath, git.CloneRepoOptions{

routers/routes/routes.go

@@ -897,6 +897,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/:jobid", reqRepoCloudBrainReader, repo.CloudBrainShow)
 			m.Get("/:jobid/debug", reqRepoCloudBrainReader, repo.CloudBrainDebug)
 			m.Post("/:jobid/commit_image", reqRepoCloudBrainReader, repo.CloudBrainCommitImage)
+			m.Post("/:jobid/stop", reqRepoCloudBrainReader, repo.CloudBrainStop)
 			m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainNew)
 			m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate)
 		}, context.RepoRef())

templates/repo/cloudbrain/index.tmpl

@@ -63,12 +63,18 @@
 									</div>
 									<div class="two wide column">
 										<span class="ui text center clipboard">
-											<a class="title" href="{{$.Link}}/{{.JobID}}">
+											<a class="title" href="{{if not .CanDebug}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/commit_image{{end}}" style="{{if not .CanDebug}}color:#CCCCCC{{end}}">
 												<span class="fitted">镜像提交</span>
 											</a>
 										</span>
 									</div>
-
+									<div class="one wide column">
+										<span class="ui text center clipboard">
+											<a class="title" href="{{if ne .Status "RUNNING"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop/{{end}}" style="{{if ne .Status "RUNNING"}}color:#CCCCCC{{end}}">
+												<span class="fitted">停止</span>
+											</a>
+										</span>
+									</div>
 								</div>
 							</div>
 						{{end}}