github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-08-17 01:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dryness

Browse Source
This commit is contained in:
Laszlo Fogas 2019-06-01 10:27:28 +02:00
parent 73aa46405a
commit 8cec8ed0d5
1 changed files with 11 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
server/build.go
View File

@ -17,7 +17,6 @@ package server
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -26,8 +25,6 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/laszlocph/drone-oss-08/cncd/pipeline/pipeline/rpc"
"github.com/laszlocph/drone-oss-08/cncd/pubsub"
"github.com/laszlocph/drone-oss-08/cncd/queue" "github.com/laszlocph/drone-oss-08/cncd/queue"
"github.com/laszlocph/drone-oss-08/remote" "github.com/laszlocph/drone-oss-08/remote"
"github.com/laszlocph/drone-oss-08/shared/httputil" "github.com/laszlocph/drone-oss-08/shared/httputil"
@ -337,7 +334,7 @@ func PostApproval(c *gin.Context) {
Yaml: conf.Data, Yaml: conf.Data,
Envs: envs, Envs: envs,
} }
items, err := b.Build() buildItems, err := b.Build()
if err != nil { if err != nil {
build.Status = model.StatusError build.Status = model.StatusError
build.Started = time.Now().Unix() build.Started = time.Now().Unix()
@ -347,73 +344,14 @@ func PostApproval(c *gin.Context) {
return return
} }
var pcounter = len(items) setBuildProcs(build, buildItems)
for _, item := range items { err = store.FromContext(c).ProcCreate(build.Procs)
build.Procs = append(build.Procs, item.Proc) if err != nil {
item.Proc.BuildID = build.ID logrus.Errorf("error persisting procs %s/%d: %s", repo.FullName, build.Number, err)
for _, stage := range item.Config.Stages {
var gid int
for _, step := range stage.Steps {
pcounter++
if gid == 0 {
gid = pcounter
}
proc := &model.Proc{
BuildID: build.ID,
Name: step.Alias,
PID: pcounter,
PPID: item.Proc.PID,
PGID: gid,
State: model.StatusPending,
}
build.Procs = append(build.Procs, proc)
}
}
}
store.FromContext(c).ProcCreate(build.Procs)
//
// publish topic
//
buildCopy := *build
buildCopy.Procs = model.Tree(buildCopy.Procs)
message := pubsub.Message{
Labels: map[string]string{
"repo": repo.FullName,
"private": strconv.FormatBool(repo.IsPrivate),
},
}
message.Data, _ = json.Marshal(model.Event{
Type: model.Enqueued,
Repo: *repo,
Build: buildCopy,
})
// TODO remove global reference
Config.Services.Pubsub.Publish(c, "topic/events", message)
//
// end publish topic
//
for _, item := range items {
task := new(queue.Task)
task.ID = fmt.Sprint(item.Proc.ID)
task.Labels = map[string]string{}
task.Labels["platform"] = item.Platform
for k, v := range item.Labels {
task.Labels[k] = v
} }
task.Data, _ = json.Marshal(rpc.Pipeline{ publishToTopic(c, build, repo)
ID: fmt.Sprint(item.Proc.ID), queueBuild(build, repo, buildItems)
Config: item.Config,
Timeout: b.Repo.Timeout,
})
Config.Services.Logs.Open(context.Background(), task.ID)
Config.Services.Queue.Push(context.Background(), task)
}
} }
func PostDecline(c *gin.Context) { func PostDecline(c *gin.Context) {
@ -463,15 +401,7 @@ func GetBuildQueue(c *gin.Context) {
c.JSON(200, out) c.JSON(200, out)
} }
//
//
//
//
//
//
func PostBuild(c *gin.Context) { func PostBuild(c *gin.Context) {
remote_ := remote.FromContext(c) remote_ := remote.FromContext(c)
repo := session.Repo(c) repo := session.Repo(c)
@ -592,7 +522,7 @@ func PostBuild(c *gin.Context) {
Yaml: conf.Data, Yaml: conf.Data,
Envs: buildParams, Envs: buildParams,
} }
items, err := b.Build() buildItems, err := b.Build()
if err != nil { if err != nil {
build.Status = model.StatusError build.Status = model.StatusError
build.Started = time.Now().Unix() build.Started = time.Now().Unix()
@ -602,30 +532,7 @@ func PostBuild(c *gin.Context) {
return return
} }
var pcounter = len(items) setBuildProcs(build, buildItems)
for _, item := range items {
build.Procs = append(build.Procs, item.Proc)
item.Proc.BuildID = build.ID
for _, stage := range item.Config.Stages {
var gid int
for _, step := range stage.Steps {
pcounter++
if gid == 0 {
gid = pcounter
}
proc := &model.Proc{
BuildID: build.ID,
Name: step.Alias,
PID: pcounter,
PPID: item.Proc.PID,
PGID: gid,
State: model.StatusPending,
}
build.Procs = append(build.Procs, proc)
}
}
}
err = store.FromContext(c).ProcCreate(build.Procs) err = store.FromContext(c).ProcCreate(build.Procs)
if err != nil { if err != nil {
@ -637,54 +544,11 @@ func PostBuild(c *gin.Context) {
c.JSON(500, build) c.JSON(500, build)
return return
} }
c.JSON(202, build) c.JSON(202, build)
// publishToTopic(c, build, repo)
// publish topic queueBuild(build, repo, buildItems)
//
buildCopy := *build
buildCopy.Procs = model.Tree(buildCopy.Procs)
message := pubsub.Message{
Labels: map[string]string{
"repo": repo.FullName,
"private": strconv.FormatBool(repo.IsPrivate),
},
} }
message.Data, _ = json.Marshal(model.Event{
Type: model.Enqueued,
Repo: *repo,
Build: buildCopy,
})
// TODO remove global reference
Config.Services.Pubsub.Publish(c, "topic/events", message)
//
// end publish topic
//
for _, item := range items {
task := new(queue.Task)
task.ID = fmt.Sprint(item.Proc.ID)
task.Labels = map[string]string{}
task.Labels["platform"] = item.Platform
for k, v := range item.Labels {
task.Labels[k] = v
}
task.Data, _ = json.Marshal(rpc.Pipeline{
ID: fmt.Sprint(item.Proc.ID),
Config: item.Config,
Timeout: b.Repo.Timeout,
})
Config.Services.Logs.Open(context.Background(), task.ID)
Config.Services.Queue.Push(context.Background(), task)
}
}
//
///
//
func DeleteBuildLogs(c *gin.Context) { func DeleteBuildLogs(c *gin.Context) {
repo := session.Repo(c) repo := session.Repo(c)