added 0.5 yaml and runtime support through feature flag

web/hook.go

@@ -17,6 +17,7 @@ import (
 	"github.com/drone/drone/shared/httputil"
 	"github.com/drone/drone/shared/token"
 	"github.com/drone/drone/store"
+	"github.com/drone/drone/queue"
 )
 
 var (
@@ -204,6 +205,35 @@ func PostHook(c *gin.Context) {
 	// on status change notifications
 	last, _ := store.GetBuildLastBefore(c, repo, build.Branch, build.ID)
 
+	// IMPORTANT. PLEASE READ
+	//
+	// The below code uses a feature flag to switch between the current
+	// build engine and the exerimental 0.5 build engine. This can be
+	// enabled using with the environment variable CANARY=true
+
+	if os.Getenv("CANARY") == "true" {
+		for _, job := range jobs {
+			queue.Publish(c, &queue.Work{
+				User:      user,
+				Repo:      repo,
+				Build:     build,
+				BuildLast: last,
+				Job:       job,
+				Keys:      key,
+				Netrc:     netrc,
+				Yaml:      string(raw),
+				YamlEnc:   string(sec),
+				System: &model.System{
+					Link:      httputil.GetURL(c.Request),
+					Plugins:   strings.Split(os.Getenv("PLUGIN_FILTER"), " "),
+					Globals:   strings.Split(os.Getenv("PLUGIN_PARAMS"), " "),
+					Escalates: strings.Split(os.Getenv("ESCALATE_FILTER"), " "),
+				},
+			})
+		}
+		return // EXIT NOT TO AVOID THE 0.4 ENGINE CODE BELOW
+	}
+
 	engine_ := engine.FromContext(c)
 	go engine_.Schedule(c.Copy(), &engine.Task{
 		User:      user,
@@ -222,5 +252,4 @@ func PostHook(c *gin.Context) {
 			Escalates: strings.Split(os.Getenv("ESCALATE_FILTER"), " "),
 		},
 	})
-
 }

web/stream2.go

@@ -0,0 +1,126 @@
+package web
+
+import (
+	"bufio"
+	"encoding/json"
+	"io"
+	"strconv"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/drone/drone/bus"
+	"github.com/drone/drone/model"
+	"github.com/drone/drone/router/middleware/session"
+	"github.com/drone/drone/store"
+	"github.com/drone/drone/stream"
+
+	log "github.com/Sirupsen/logrus"
+
+	"github.com/manucorporat/sse"
+)
+
+// IMPORTANT. PLEASE READ
+//
+// This file containers experimental streaming features for the 0.5
+// release. These can be enabled with the feature flag CANARY=true
+
+// GetRepoEvents will upgrade the connection to a Websocket and will stream
+// event updates to the browser.
+func GetRepoEvents2(c *gin.Context) {
+	repo := session.Repo(c)
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+
+	eventc := make(chan *bus.Event, 1)
+	bus.Subscribe(c, eventc)
+	defer func() {
+		bus.Unsubscribe(c, eventc)
+		close(eventc)
+		log.Infof("closed event stream")
+	}()
+
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case event := <-eventc:
+			if event == nil {
+				log.Infof("nil event received")
+				return false
+			}
+
+			if event.Repo.FullName == repo.FullName {
+
+				var payload = struct {
+					model.Build
+					Jobs []*model.Job `json:"jobs"`
+				}{}
+				payload.Build = event.Build
+				payload.Jobs, _ = store.GetJobList(c, &event.Build)
+				data, _ := json.Marshal(&payload)
+
+				sse.Encode(w, sse.Event{
+					Event: "message",
+					Data:  string(data),
+				})
+			}
+		case <-c.Writer.CloseNotify():
+			return false
+		}
+		return true
+	})
+}
+
+func GetStream2(c *gin.Context) {
+
+	repo := session.Repo(c)
+	buildn, _ := strconv.Atoi(c.Param("build"))
+	jobn, _ := strconv.Atoi(c.Param("number"))
+
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+
+	build, err := store.GetBuildNumber(c, repo, buildn)
+	if err != nil {
+		log.Debugln("stream cannot get build number.", err)
+		c.AbortWithError(404, err)
+		return
+	}
+	job, err := store.GetJobNumber(c, build, jobn)
+	if err != nil {
+		log.Debugln("stream cannot get job number.", err)
+		c.AbortWithError(404, err)
+		return
+	}
+
+	rc, wc, err := stream.Open(c, stream.ToKey(job.ID))
+	if err != nil {
+		c.AbortWithError(404, err)
+		return
+	}
+
+	defer func() {
+		if wc != nil {
+			wc.Close()
+		}
+		if rc != nil {
+			rc.Close()
+		}
+	}()
+
+	go func() {
+		<-c.Writer.CloseNotify()
+		rc.Close()
+	}()
+
+	var line int
+	var scanner = bufio.NewScanner(rc)
+	for scanner.Scan() {
+		line++
+		var err = sse.Encode(c.Writer, sse.Event{
+			Id:    strconv.Itoa(line),
+			Event: "message",
+			Data:  scanner.Text(),
+		})
+		if err != nil {
+			break
+		}
+		c.Writer.Flush()
+	}
+}