github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 03:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor job to proc

Browse Source
This commit is contained in:
Brad Rydzewski
2017-04-02 23:13:26 +09:00
parent f090a2d34f
commit ec88661d9e
14 changed files with 496 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/stream.go
View File

@@ -66,13 +66,13 @@ func LogStream(c *gin.Context) {
c.AbortWithError(404, err)
return
}
job, err := store.GetJobNumber(c, build, jobn)
proc, err := store.FromContext(c).ProcFind(build, jobn)
if err != nil {
logrus.Debugln("stream cannot get job number.", err)
logrus.Debugln("stream cannot get proc number.", err)
c.AbortWithError(404, err)
return
}
if job.Status != model.StatusRunning {
if proc.State != model.StatusRunning {
logrus.Debugln("stream not found.")
c.AbortWithStatus(404)
return
@@ -102,7 +102,7 @@ func LogStream(c *gin.Context) {
go func() {
// TODO remove global variable
config.logger.Tail(ctx, fmt.Sprint(job.ID), func(entries ...*logging.Entry) {
config.logger.Tail(ctx, fmt.Sprint(proc.ID), func(entries ...*logging.Entry) {
for _, entry := range entries {
select {
case <-ctx.Done():