core: Execution.skipped in core, middleware: fix overlap bahaviour

Author: mcuadros

core/scheduler.go

@@ -110,11 +110,13 @@ func (w *jobWrapper) stop(ctx *Context, err error) {
 	}
 
 	msg := fmt.Sprintf(
-		"%s - Job finished %q in %q, failed: %t, error: %s",
-		ctx.Job.GetName(), ctx.Execution.ID, ctx.Execution.Duration, ctx.Execution.Failed, errText,
+		"%s - Job finished %q in %q, failed: %t, skipped: %t, error: %s",
+		ctx.Job.GetName(), ctx.Execution.ID, ctx.Execution.Duration, ctx.Execution.Failed, ctx.Execution.Skipped, errText,
 	)
 
-	if ctx.Execution.Error != nil {
+	if ctx.Execution.Failed {
+		ctx.Logger.Error(msg)
+	} else if ctx.Execution.Skipped {
 		ctx.Logger.Warning(msg)
 	} else {
 		ctx.Logger.Notice(msg)

middlewares/overlap.go

@@ -25,7 +25,7 @@ func (m *Overlap) ContinueOnStop() bool {
 
 func (m *Overlap) Run(ctx *core.Context) error {
 	if m.NoOverlap && ctx.Job.Running() > 1 {
-		return core.ErrSkippedExecution
+		ctx.Stop(core.ErrSkippedExecution)
 	}
 
 	return ctx.Next()

middlewares/overlap_test.go

@@ -1,9 +1,6 @@
 package middlewares
 
-import (
-	"github.com/mcuadros/ofelia/core"
-	. "gopkg.in/check.v1"
-)
+import . "gopkg.in/check.v1"
 
 type SuiteOverlap struct {
 	BaseSuite
@@ -21,16 +18,12 @@ func (s *SuiteOverlap) TestRun(c *C) {
 }
 
 func (s *SuiteOverlap) TestRunOverlap(c *C) {
+	s.ctx.Execution.Start()
 	s.ctx.Job.NotifyStart()
 	s.ctx.Job.NotifyStart()
 
-	m := NewOverlap(&OverlapConfig{NoOverlap: true})
-	c.Assert(m.Run(s.ctx), Equals, core.ErrSkippedExecution)
-}
-
-func (s *SuiteOverlap) TestRunAllowOverlap(c *C) {
-	s.ctx.Job.NotifyStart()
-
 	m := NewOverlap(&OverlapConfig{NoOverlap: true})
 	c.Assert(m.Run(s.ctx), IsNil)
+	c.Assert(s.ctx.Execution.IsRunning, Equals, false)
+	c.Assert(s.ctx.Execution.Skipped, Equals, true)
 }

middlewares/slack.go

@@ -16,8 +16,8 @@ var (
 )
 
 type SlackConfig struct {
-	URL     string `gcfg:"slack-webhook"`
-	OnError bool   `gcfg:"slack-on-error"`
+	URL         string `gcfg:"slack-webhook"`
+	OnlyOnError bool   `gcfg:"slack-only-on-error"`
 }
 
 func NewSlack(c *SlackConfig) core.Middleware {
@@ -44,7 +44,7 @@ func (m *Slack) Run(ctx *core.Context) error {
 	err := ctx.Next()
 	ctx.Stop(err)
 
-	if ctx.Execution.Failed || !m.OnError {
+	if ctx.Execution.Failed || !m.OnlyOnError {
 		m.pushMessage(ctx)
 	}
 
@@ -81,6 +81,11 @@ func (m *Slack) buildMessage(ctx *core.Context) *slackMessage {
 			Text:  ctx.Execution.Error.Error(),
 			Color: "#F35A00",
 		})
+	} else if ctx.Execution.Skipped {
+		msg.Attachments = append(msg.Attachments, slackAttachment{
+			Title: "Execution skipped",
+			Color: "#FFA500",
+		})
 	} else {
 		msg.Attachments = append(msg.Attachments, slackAttachment{
 			Title: "Execution successful",

middlewares/slack_test.go

@@ -61,6 +61,6 @@ func (s *SuiteSlack) TestRunSuccessOnError(c *C) {
 	s.ctx.Start()
 	s.ctx.Stop(nil)
 
-	m := NewSlack(&SlackConfig{URL: ts.URL, OnError: true})
+	m := NewSlack(&SlackConfig{URL: ts.URL, OnlyOnError: true})
 	c.Assert(m.Run(s.ctx), IsNil)
 }