local jobs

Author: mcuadros

README.md

@@ -18,7 +18,12 @@ The main feature of **Ofelia** is the ability to execute commands directly on Do
 
 ## Configuration
 
-It uses a INI-style config file and the [scheduling format](https://godoc.org/github.com/robfig/cron) is exactly the same from the original `cron`:
+It uses a INI-style config file and the [scheduling format](https://godoc.org/github.com/robfig/cron) is exactly the same from the original `cron`, you can configure three different kind of jobs:
+
+- `job-exec`: this job is executed inside of a running container.
+- `job-run`: runs a command inside of a new container, using a specific image.
+- `job-local`: runs the command inside of the host running ofelia.
+
 
 ```ini
 [job-exec "job-executed-on-running-container"]
@@ -30,6 +35,10 @@ command = touch /tmp/example
 schedule = @hourly
 image = ubuntu:latest
 command = touch /tmp/example
+
+[job-local "job-executed-on-current-host"]
+schedule = @hourly
+command = touch /tmp/example
 ```
 
 

cli/config.go

@@ -19,8 +19,9 @@ type Config struct {
 		middlewares.SaveConfig
 		middlewares.MailConfig
 	}
-	ExecJobs map[string]*ExecJobConfig `gcfg:"job-exec"`
-	RunJobs  map[string]*RunJobConfig  `gcfg:"job-run"`
+	ExecJobs  map[string]*ExecJobConfig  `gcfg:"job-exec"`
+	RunJobs   map[string]*RunJobConfig   `gcfg:"job-run"`
+	LocalJobs map[string]*LocalJobConfig `gcfg:"job-local"`
 }
 
 // BuildFromFile buils a scheduler using the config from a file
@@ -72,6 +73,14 @@ func (c *Config) build() (*core.Scheduler, error) {
 		sh.AddJob(j)
 	}
 
+	for name, j := range c.LocalJobs {
+		defaults.SetDefaults(j)
+
+		j.Name = name
+		j.buildMiddlewares()
+		sh.AddJob(j)
+	}
+
 	return sh, nil
 }
 
@@ -127,3 +136,19 @@ func (c *RunJobConfig) buildMiddlewares() {
 	c.RunJob.Use(middlewares.NewSave(&c.SaveConfig))
 	c.RunJob.Use(middlewares.NewMail(&c.MailConfig))
 }
+
+// LocalJobConfig contains all configuration params needed to build a RunJob
+type LocalJobConfig struct {
+	core.LocalJob
+	middlewares.OverlapConfig
+	middlewares.SlackConfig
+	middlewares.SaveConfig
+	middlewares.MailConfig
+}
+
+func (c *LocalJobConfig) buildMiddlewares() {
+	c.LocalJob.Use(middlewares.NewOverlap(&c.OverlapConfig))
+	c.LocalJob.Use(middlewares.NewSlack(&c.SlackConfig))
+	c.LocalJob.Use(middlewares.NewSave(&c.SaveConfig))
+	c.LocalJob.Use(middlewares.NewMail(&c.MailConfig))
+}

cli/config_test.go

@@ -16,22 +16,19 @@ func (s *SuiteConfig) TestBuildFromString(c *C) {
 	sh, err := BuildFromString(`
 		[job-exec "foo"]
 		schedule = @every 10s
-		container = test
 
 		[job-exec "bar"]
 		schedule = @every 10s
-		container = test
 
 		[job-run "qux"]
 		schedule = @every 10s
-		image = test
+
+		[job-local "baz"]
+		schedule = @every 10s
   `)
 
 	c.Assert(err, IsNil)
-	c.Assert(sh.Jobs, HasLen, 3)
-	c.Assert(sh.Jobs[0].GetName(), Equals, "foo")
-	c.Assert(sh.Jobs[1].GetName(), Equals, "bar")
-	c.Assert(sh.Jobs[2].GetName(), Equals, "qux")
+	c.Assert(sh.Jobs, HasLen, 4)
 }
 
 func (s *SuiteConfig) TestExecJobBuildEmpty(c *C) {

core/localjob.go

@@ -0,0 +1,43 @@
+package core
+
+import (
+	"os/exec"
+
+	"github.com/gobs/args"
+)
+
+type LocalJob struct {
+	BareJob
+	Dir         string
+	Environment []string
+}
+
+func NewLocalJob() *LocalJob {
+	return &LocalJob{}
+}
+
+func (j *LocalJob) Run(ctx *Context) error {
+	cmd, err := j.buildCommand(ctx)
+	if err != nil {
+		return err
+	}
+
+	return cmd.Run()
+}
+
+func (j *LocalJob) buildCommand(ctx *Context) (*exec.Cmd, error) {
+	args := args.GetArgs(j.Command)
+	bin, err := exec.LookPath(args[0])
+	if err != nil {
+		return nil, err
+	}
+
+	return &exec.Cmd{
+		Path:   bin,
+		Args:   args,
+		Stdout: ctx.Execution.OutputStream,
+		Stderr: ctx.Execution.ErrorStream,
+		Env:    j.Environment,
+		Dir:    j.Dir,
+	}, nil
+}

core/localjob_test.go

@@ -0,0 +1,24 @@
+package core
+
+import (
+	"bytes"
+
+	. "gopkg.in/check.v1"
+)
+
+type SuiteLocalJob struct{}
+
+var _ = Suite(&SuiteLocalJob{})
+
+func (s *SuiteLocalJob) TestRun(c *C) {
+	job := &LocalJob{}
+	job.Command = `echo "foo bar"`
+
+	b := bytes.NewBuffer(nil)
+	e := NewExecution()
+	e.OutputStream = b
+
+	err := job.Run(&Context{Execution: e})
+	c.Assert(err, IsNil)
+	c.Assert(b.String(), Equals, "foo bar\n")
+}