forked from harness/harness
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
queue integrated with server, but not agent
- Loading branch information
1 parent
524fba6
commit f2c1d46
Showing
12 changed files
with
648 additions
and
513 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,94 @@ | ||
| package queue | ||
|
|
||
| import ( | ||
| "sync" | ||
| "testing" | ||
|
|
||
| . "github.com/franela/goblin" | ||
| "github.com/gin-gonic/gin" | ||
| ) | ||
|
|
||
| func TestBuild(t *testing.T) { | ||
| g := Goblin(t) | ||
| g.Describe("Queue", func() { | ||
|
|
||
| g.It("Should publish item", func() { | ||
| c := new(gin.Context) | ||
| q := newQueue() | ||
| ToContext(c, q) | ||
|
|
||
| w1 := &Work{} | ||
| w2 := &Work{} | ||
| Publish(c, w1) | ||
| Publish(c, w2) | ||
| g.Assert(len(q.items)).Equal(2) | ||
| g.Assert(len(q.itemc)).Equal(2) | ||
| }) | ||
|
|
||
| g.It("Should remove item", func() { | ||
| c := new(gin.Context) | ||
| q := newQueue() | ||
| ToContext(c, q) | ||
|
|
||
| w1 := &Work{} | ||
| w2 := &Work{} | ||
| w3 := &Work{} | ||
| Publish(c, w1) | ||
| Publish(c, w2) | ||
| Publish(c, w3) | ||
| Remove(c, w2) | ||
| g.Assert(len(q.items)).Equal(2) | ||
| g.Assert(len(q.itemc)).Equal(2) | ||
|
|
||
| g.Assert(Pull(c)).Equal(w1) | ||
| g.Assert(Pull(c)).Equal(w3) | ||
| g.Assert(Remove(c, w2)).Equal(ErrNotFound) | ||
| }) | ||
|
|
||
| g.It("Should pull item", func() { | ||
| c := new(gin.Context) | ||
| q := New() | ||
| ToContext(c, q) | ||
|
|
||
| cn := new(closeNotifier) | ||
| cn.closec = make(chan bool, 1) | ||
| w1 := &Work{} | ||
| w2 := &Work{} | ||
|
|
||
| Publish(c, w1) | ||
| g.Assert(Pull(c)).Equal(w1) | ||
|
|
||
| Publish(c, w2) | ||
| g.Assert(PullClose(c, cn)).Equal(w2) | ||
| }) | ||
|
|
||
| g.It("Should cancel pulling item", func() { | ||
| c := new(gin.Context) | ||
| q := New() | ||
| ToContext(c, q) | ||
|
|
||
| cn := new(closeNotifier) | ||
| cn.closec = make(chan bool, 1) | ||
| var wg sync.WaitGroup | ||
| go func() { | ||
| wg.Add(1) | ||
| g.Assert(PullClose(c, cn) == nil).IsTrue() | ||
| wg.Done() | ||
| }() | ||
| go func() { | ||
| cn.closec <- true | ||
| }() | ||
| wg.Wait() | ||
|
|
||
| }) | ||
| }) | ||
| } | ||
|
|
||
| type closeNotifier struct { | ||
| closec chan bool | ||
| } | ||
|
|
||
| func (c *closeNotifier) CloseNotify() <-chan bool { | ||
| return c.closec | ||
| } | ||
| // | ||
| // import ( | ||
| // "sync" | ||
| // "testing" | ||
| // | ||
| // . "github.com/franela/goblin" | ||
| // "github.com/gin-gonic/gin" | ||
| // ) | ||
| // | ||
| // func TestBuild(t *testing.T) { | ||
| // g := Goblin(t) | ||
| // g.Describe("Queue", func() { | ||
| // | ||
| // g.It("Should publish item", func() { | ||
| // c := new(gin.Context) | ||
| // q := newQueue() | ||
| // ToContext(c, q) | ||
| // | ||
| // w1 := &Work{} | ||
| // w2 := &Work{} | ||
| // Publish(c, w1) | ||
| // Publish(c, w2) | ||
| // g.Assert(len(q.items)).Equal(2) | ||
| // g.Assert(len(q.itemc)).Equal(2) | ||
| // }) | ||
| // | ||
| // g.It("Should remove item", func() { | ||
| // c := new(gin.Context) | ||
| // q := newQueue() | ||
| // ToContext(c, q) | ||
| // | ||
| // w1 := &Work{} | ||
| // w2 := &Work{} | ||
| // w3 := &Work{} | ||
| // Publish(c, w1) | ||
| // Publish(c, w2) | ||
| // Publish(c, w3) | ||
| // Remove(c, w2) | ||
| // g.Assert(len(q.items)).Equal(2) | ||
| // g.Assert(len(q.itemc)).Equal(2) | ||
| // | ||
| // g.Assert(Pull(c)).Equal(w1) | ||
| // g.Assert(Pull(c)).Equal(w3) | ||
| // g.Assert(Remove(c, w2)).Equal(ErrNotFound) | ||
| // }) | ||
| // | ||
| // g.It("Should pull item", func() { | ||
| // c := new(gin.Context) | ||
| // q := New() | ||
| // ToContext(c, q) | ||
| // | ||
| // cn := new(closeNotifier) | ||
| // cn.closec = make(chan bool, 1) | ||
| // w1 := &Work{} | ||
| // w2 := &Work{} | ||
| // | ||
| // Publish(c, w1) | ||
| // g.Assert(Pull(c)).Equal(w1) | ||
| // | ||
| // Publish(c, w2) | ||
| // g.Assert(PullClose(c, cn)).Equal(w2) | ||
| // }) | ||
| // | ||
| // g.It("Should cancel pulling item", func() { | ||
| // c := new(gin.Context) | ||
| // q := New() | ||
| // ToContext(c, q) | ||
| // | ||
| // cn := new(closeNotifier) | ||
| // cn.closec = make(chan bool, 1) | ||
| // var wg sync.WaitGroup | ||
| // go func() { | ||
| // wg.Add(1) | ||
| // g.Assert(PullClose(c, cn) == nil).IsTrue() | ||
| // wg.Done() | ||
| // }() | ||
| // go func() { | ||
| // cn.closec <- true | ||
| // }() | ||
| // wg.Wait() | ||
| // | ||
| // }) | ||
| // }) | ||
| // } | ||
| // | ||
| // type closeNotifier struct { | ||
| // closec chan bool | ||
| // } | ||
| // | ||
| // func (c *closeNotifier) CloseNotify() <-chan bool { | ||
| // return c.closec | ||
| // } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package middleware | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| handlers "github.com/drone/drone/server" | ||
|
|
||
| "github.com/codegangsta/cli" | ||
| "github.com/drone/mq/server" | ||
| "github.com/drone/mq/stomp" | ||
|
|
||
| "github.com/Sirupsen/logrus" | ||
| "github.com/gin-gonic/gin" | ||
| ) | ||
|
|
||
| const ( | ||
| serverKey = "broker" | ||
| clientKey = "stomp.client" // mirrored from stomp/context | ||
| ) | ||
|
|
||
| // Broker is a middleware function that initializes the broker | ||
| // and adds the broker client to the request context. | ||
| func Broker(cli *cli.Context) gin.HandlerFunc { | ||
| secret := cli.String("agent-secret") | ||
| if secret == "" { | ||
| logrus.Fatalf("failed to generate token from DRONE_SECRET") | ||
| } | ||
|
|
||
| broker := server.NewServer( | ||
| server.WithCredentials("x-token", secret), | ||
| ) | ||
| client := broker.Client() | ||
|
|
||
| var once sync.Once | ||
| return func(c *gin.Context) { | ||
| c.Set(serverKey, broker) | ||
| c.Set(clientKey, client) | ||
| once.Do(func() { | ||
| // this is some really hacky stuff | ||
| // turns out I need to do some refactoring | ||
| // don't judge! | ||
| // will fix in 0.6 release | ||
| ctx := c.Copy() | ||
| client.Connect( | ||
| stomp.WithCredentials("x-token", secret), | ||
| ) | ||
| client.Subscribe("/queue/updates", stomp.HandlerFunc(func(m *stomp.Message) { | ||
| go handlers.HandleUpdate(ctx, m.Copy()) | ||
| })) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package server | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| ) | ||
|
|
||
| // Broker handles connections to the embedded message broker. | ||
| func Broker(c *gin.Context) { | ||
| broker := c.MustGet("broker").(http.Handler) | ||
| broker.ServeHTTP(c.Writer, c.Request) | ||
| } |
Oops, something went wrong.