Skip to content

Commit a578833

Browse files
mcuadrosmcuadros
committed
makefile, fix logger interface and travis
1 parent e364792 commit a578833

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: go
33
sudo: false
44

55
go:
6-
- 1.5
6+
- 1.7.x
77

88
script:
99
- make test-coverage

‎Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PACKAGES = github.com/mcuadros/ofelia/core \
1010
BASE_PATH := $(shell pwd)
1111
BUILD_PATH := $(BASE_PATH)/build
1212
SHA1 := $(shell git log --format='%H' -n 1 | cut -c1-10)
13-
BUILD := $(shell date)
13+
BUILD := $(shell date +"%m-%d-%Y_%H_%M_%S")
1414
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1515

1616
# Packages content
@@ -36,32 +36,32 @@ ifneq ($(origin TRAVIS_TAG), undefined)
3636
endif
3737

3838
# Rules
39-
all: clean upload
39+
all: clean packages
4040

4141
dependencies:
42-
$(GOGET) -t ./...
42+
@$(GOGET) -t ./...; \
4343
for i in $(DEPENDENCIES); do $(GOGET) $$i; done
4444

4545
test: dependencies
46-
for p in $(PACKAGES); do \
46+
@for p in $(PACKAGES); do \
4747
$(GOTEST) $${p}; \
4848
done;
4949

5050
test-coverage: dependencies
51-
echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT); \
51+
@echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT); \
5252
for p in $(PACKAGES); do \
5353
$(GOTEST) $${p} -coverprofile=tmp_$(COVERAGE_REPORT) -covermode=$(COVERAGE_MODE); \
5454
cat tmp_$(COVERAGE_REPORT) | grep -v "mode: $(COVERAGE_MODE)" >> $(COVERAGE_REPORT); \
5555
rm tmp_$(COVERAGE_REPORT); \
5656
done;
5757

5858
packages: dependencies
59-
for os in $(PKG_OS); do \
59+
@for os in $(PKG_OS); do \
6060
for arch in $(PKG_ARCH); do \
6161
cd $(BASE_PATH); \
6262
mkdir -p $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}; \
6363
for cmd in $(COMMANDS); do \
64-
GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags "-X main.version $(BRANCH) -X main.build \"$(BUILD)\"" -o $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/$${cmd} $${cmd}.go ; \
64+
GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags "-X main.version=$(BRANCH) -X main.build=$(BUILD)" -o $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/$${cmd} $${cmd}.go;\
6565
done; \
6666
for content in $(PKG_CONTENT); do \
6767
cp -rf $${content} $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/; \
@@ -71,5 +71,5 @@ packages: dependencies
7171
done;
7272

7373
clean:
74-
rm -rf $(BUILD_PATH)
74+
@rm -rf $(BUILD_PATH); \
7575
$(GOCLEAN) .

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
It has been a long time since [`cron`](https://en.wikipedia.org/wiki/Cron) was released, actually more than 28 years. The world has changed a lot and especially since the `Docker` revolution. **Vixie's cron** works great but it's not extensible and it's hard to debug when something goes wrong.
1111

12-
Many solutions are available: ready to go containerized `crons`, wrappers for your commands, etc. but in the end simple tasks become complex.
12+
Many solutions are available: ready to go containerized `crons`, wrappers for your commands, etc. but in the end simple tasks become complex.
1313

1414
### How?
1515

‎cli/daemon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (c *DaemonCommand) setSignals() {
6262

6363
go func() {
6464
sig := <-c.signals
65-
c.scheduler.Logger.Warning(
65+
c.scheduler.Logger.Warningf(
6666
"Signal recieved: %s, shuting down the process\n", sig,
6767
)
6868

@@ -76,6 +76,6 @@ func (c *DaemonCommand) shutdown() error {
7676
return nil
7777
}
7878

79-
c.scheduler.Logger.Warning("Waiting running jobs.")
79+
c.scheduler.Logger.Warningf("Waiting running jobs.")
8080
return c.scheduler.Stop()
8181
}

‎core/common.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@ func (c *middlewareContainer) Middlewares() []Middleware {
197197
}
198198

199199
type Logger interface {
200-
Critical(args ...interface{})
201-
Debug(args ...interface{})
202-
Error(args ...interface{})
203-
Notice(args ...interface{})
204-
Warning(args ...interface{})
200+
Criticalf(format string, args ...interface{})
201+
Debugf(format string, args ...interface{})
202+
Errorf(format string, args ...interface{})
203+
Noticef(format string, args ...interface{})
204+
Warningf(format string, args ...interface{})
205205
}
206206

207207
func randomID() string {

‎core/common_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ func (j *TestJob) Run(ctx *Context) error {
311311

312312
type TestLogger struct{}
313313

314-
func (*TestLogger) Critical(format string, args ...interface{}) {}
315-
func (*TestLogger) Debug(format string, args ...interface{}) {}
316-
func (*TestLogger) Error(format string, args ...interface{}) {}
317-
func (*TestLogger) Notice(format string, args ...interface{}) {}
318-
func (*TestLogger) Warning(format string, args ...interface{}) {}
314+
func (*TestLogger) Criticalf(format string, args ...interface{}) {}
315+
func (*TestLogger) Debugf(format string, args ...interface{}) {}
316+
func (*TestLogger) Errorf(format string, args ...interface{}) {}
317+
func (*TestLogger) Noticef(format string, args ...interface{}) {}
318+
func (*TestLogger) Warningf(format string, args ...interface{}) {}

‎core/scheduler.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func NewScheduler(l Logger) *Scheduler {
3131
}
3232

3333
func (s *Scheduler) AddJob(j Job) error {
34-
s.Logger.Notice("New job registered %q - %q - %q", j.GetName(), j.GetCommand(), j.GetSchedule())
34+
s.Logger.Noticef("New job registered %q - %q - %q", j.GetName(), j.GetCommand(), j.GetSchedule())
3535

3636
if j.GetSchedule() == "" {
3737
return ErrEmptySchedule
@@ -51,7 +51,7 @@ func (s *Scheduler) Start() error {
5151
return ErrEmptyScheduler
5252
}
5353

54-
s.Logger.Debug("Starting scheduler with %d jobs", len(s.Jobs))
54+
s.Logger.Debugf("Starting scheduler with %d jobs", len(s.Jobs))
5555

5656
s.mergeMiddlewares()
5757
s.isRunning = true
@@ -97,7 +97,7 @@ func (w *jobWrapper) Run() {
9797
func (w *jobWrapper) start(ctx *Context) {
9898
ctx.Start()
9999

100-
ctx.Logger.Debug(
100+
ctx.Logger.Debugf(
101101
"%s - Job started %q - %q",
102102
ctx.Job.GetName(), ctx.Execution.ID, ctx.Job.GetCommand(),
103103
)
@@ -117,10 +117,10 @@ func (w *jobWrapper) stop(ctx *Context, err error) {
117117
)
118118

119119
if ctx.Execution.Failed {
120-
ctx.Logger.Error(msg)
120+
ctx.Logger.Errorf(msg)
121121
} else if ctx.Execution.Skipped {
122-
ctx.Logger.Warning(msg)
122+
ctx.Logger.Warningf(msg)
123123
} else {
124-
ctx.Logger.Notice(msg)
124+
ctx.Logger.Noticef(msg)
125125
}
126126
}

‎middlewares/common_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (j *TestJob) Run(ctx *core.Context) error {
5656

5757
type TestLogger struct{}
5858

59-
func (*TestLogger) Critical(format string, args ...interface{}) {}
60-
func (*TestLogger) Debug(format string, args ...interface{}) {}
61-
func (*TestLogger) Error(format string, args ...interface{}) {}
62-
func (*TestLogger) Notice(format string, args ...interface{}) {}
63-
func (*TestLogger) Warning(format string, args ...interface{}) {}
59+
func (*TestLogger) Criticalf(format string, args ...interface{}) {}
60+
func (*TestLogger) Debugf(format string, args ...interface{}) {}
61+
func (*TestLogger) Errorf(format string, args ...interface{}) {}
62+
func (*TestLogger) Noticef(format string, args ...interface{}) {}
63+
func (*TestLogger) Warningf(format string, args ...interface{}) {}

‎middlewares/mail.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (m *Mail) Run(ctx *core.Context) error {
5454
if ctx.Execution.Failed || !m.MailOnlyOnError {
5555
err := m.sendMail(ctx)
5656
if err != nil {
57-
ctx.Logger.Error("Mail error: %q", err)
57+
ctx.Logger.Errorf("Mail error: %q", err)
5858
}
5959
}
6060

‎middlewares/save.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (m *Save) Run(ctx *core.Context) error {
4646
if ctx.Execution.Failed || !m.SaveOnlyOnError {
4747
err := m.saveToDisk(ctx)
4848
if err != nil {
49-
ctx.Logger.Error("Save error: %q", err)
49+
ctx.Logger.Errorf("Save error: %q", err)
5050
}
5151
}
5252

‎middlewares/slack.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ func (m *Slack) pushMessage(ctx *core.Context) {
6161

6262
r, err := http.PostForm(m.SlackWebhook, values)
6363
if err != nil {
64-
ctx.Logger.Error("Slack error calling %q error: %q", m.SlackWebhook, err)
64+
ctx.Logger.Errorf("Slack error calling %q error: %q", m.SlackWebhook, err)
6565
} else if r.StatusCode != 200 {
66-
ctx.Logger.Error("Slack error non-200 status code calling %q", m.SlackWebhook)
66+
ctx.Logger.Errorf("Slack error non-200 status code calling %q", m.SlackWebhook)
6767
}
6868
}
6969

0 commit comments

Comments
 (0)