3 files changed, 35 insertions(+), 6 deletions(-)

M email/email.go
A server/queue.go
M server/server.go

@@ 39,8 39,7 @@ func (s *ServiceQueue) SendMail(msg *carrier.Message) error {
 		// No work queue set, send immediately
 		return s.service.Send(msg)
 	}
-	work.Enqueue(s.mailTask(msg))
-	return nil
+	return s.queue.Enqueue(s.mailTask(msg))
 }
 
 func (s *ServiceQueue) mailTask(msg *carrier.Message) *work.Task {

@@ 0,0 1,14 @@
+package server
+
+import work "git.sr.ht/~sircmpwn/dowork"
+
+// GQueue is a dowork queue wrapper that lets you name it
+type GQueue struct {
+	Queue *work.Queue
+	Name  string
+}
+
+// NewQueue returns a new GQueue instance
+func NewQueue(name string) *GQueue {
+	return &GQueue{work.NewQueue(name), name}
+}

@@ 59,7 59,7 @@ type Server struct {
 	e        *echo.Echo
 	ai       *appInfo
 	csrfSkip []string
-	queues   []*work.Queue
+	queues   []*GQueue
 }
 
 // Context is the context passed to handlers and middlewares


@@ 321,15 321,26 @@ func (s *Server) WithMiddleware(middlewares ...echo.MiddlewareFunc) *Server {
 }
 
 // WithQueues add dowork task queues for this server to manage
-func (s *Server) WithQueues(queues ...*work.Queue) *Server {
+func (s *Server) WithQueues(queues ...*GQueue) *Server {
 	ctx := context.Background()
 	s.queues = append(s.queues, queues...)
 	for _, queue := range queues {
-		queue.Start(ctx)
+		queue.Queue.Start(ctx)
 	}
 	return s
 }
 
+// QueueTask will add a task to a specific queue. Queue should be identified
+// by queue name.
+func (s *Server) QueueTask(qname string, task *work.Task) error {
+	for _, q := range s.queues {
+		if q.Name == qname {
+			return q.Queue.Enqueue(task)
+		}
+	}
+	return fmt.Errorf("No queue found with name '%s'", qname)
+}
+
 // WithEmail sets the email ServiceQueue instance
 func (s *Server) WithEmail(svc *email.ServiceQueue) *Server {
 	s.Email = svc


@@ 400,7 411,12 @@ func (s *Server) Shutdown() {
 	cancel()
 
 	s.e.Logger.Printf("Terminating work queues...\n")
-	work.Join(s.queues...)
+	var queues []*work.Queue
+	for _, q := range s.queues {
+		queues = append(queues, q.Queue)
+	}
+	work.Join(queues...)
+
 	s.e.Logger.Printf("Shutdown completed.\n")
 }