Skip to content

Commit f7644da

Browse files
devfeeldevfeel
committed
#### Version 0.9.5
* Opt: 修正Logger定义，与dotlog适配 * Opt: 整理代码格式 * 2020-01-05 09:00 at ShangHai
1 parent 039c783 commit f7644da

7 files changed

Lines changed: 42 additions & 36 deletions

File tree

‎crontask.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ func (task *CronTask) Reset(conf *TaskConfig) error {
4545
//basic check
4646
if conf.Express == "" {
4747
errmsg := "express is empty"
48-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "error", errmsg)
48+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "error", errmsg))
4949
return errors.New(errmsg)
5050
}
5151
if len(expresslist) != 6 {
5252
errmsg := "express is wrong format => not 6 parts"
53-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "error", errmsg)
53+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "error", errmsg))
5454
return errors.New("express is wrong format => not 6 parts")
5555
}
5656

@@ -80,7 +80,7 @@ func (task *CronTask) Reset(conf *TaskConfig) error {
8080
task.taskService.debugExpress(task.time_Second)
8181
}
8282
task.Start()
83-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "success")
83+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "success"))
8484
return nil
8585
}
8686

@@ -158,13 +158,13 @@ func doCronTask(task *CronTask) {
158158
defer func() {
159159
if err := recover(); err != nil {
160160
task.CounterInfo().ErrorCounter.Inc(1)
161-
task.taskService.Logger().Debug(task.TaskID, " cron handler recover error => ", err)
161+
task.taskService.Logger().Debug(fmt.Sprint(task.TaskID, " cron handler recover error => ", err))
162162
if task.taskService.ExceptionHandler != nil {
163163
task.taskService.ExceptionHandler(task.Context(), fmt.Errorf("%v", err))
164164
}
165165
//goroutine panic, restart cron task
166166
startCronTask(task)
167-
task.taskService.Logger().Debug(task.TaskID, " goroutine panic, restart CronTask")
167+
task.taskService.Logger().Debug(fmt.Sprint(task.TaskID, " goroutine panic, restart CronTask"))
168168
}
169169
}()
170170
now := time.Now()

‎logger.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const (
1515

1616
type (
1717
Logger interface {
18-
Error(v ...interface{})
19-
Warn(v ...interface{})
20-
Info(v ...interface{})
21-
Debug(v ...interface{})
18+
Error(err error, v interface{})
19+
Warn(v interface{})
20+
Info(v interface{})
21+
Debug(v interface{})
2222
}
2323

2424
fileLogger struct {
@@ -33,17 +33,17 @@ func NewFmtLogger() *fmtLogger {
3333
return &fmtLogger{}
3434
}
3535

36-
func (logger *fmtLogger) Debug(v ...interface{}) {
37-
logger.writeLog(fmt.Sprint(v...), "debug")
36+
func (logger *fmtLogger) Debug(v interface{}) {
37+
logger.writeLog(fmt.Sprint(v), "debug")
3838
}
39-
func (logger *fmtLogger) Info(v ...interface{}) {
40-
logger.writeLog(fmt.Sprint(v...), "info")
39+
func (logger *fmtLogger) Info(v interface{}) {
40+
logger.writeLog(fmt.Sprint(v), "info")
4141
}
42-
func (logger *fmtLogger) Warn(v ...interface{}) {
43-
logger.writeLog(fmt.Sprint(v...), "warn")
42+
func (logger *fmtLogger) Warn(v interface{}) {
43+
logger.writeLog(fmt.Sprint(v), "warn")
4444
}
45-
func (logger *fmtLogger) Error(v ...interface{}) {
46-
logger.writeLog(fmt.Sprint(v...), "error")
45+
func (logger *fmtLogger) Error(err error, v interface{}) {
46+
logger.writeLog(fmt.Sprint(v, err), "error")
4747
}
4848

4949
func (logger *fmtLogger) writeLog(log string, level string) {
@@ -61,17 +61,17 @@ func NewFileLogger(filePath string) *fileLogger {
6161
return logger
6262
}
6363

64-
func (logger *fileLogger) Debug(v ...interface{}) {
65-
logger.writeLog(fmt.Sprint(v...), "debug")
64+
func (logger *fileLogger) Debug(v interface{}) {
65+
logger.writeLog(fmt.Sprint(v), "debug")
6666
}
67-
func (logger *fileLogger) Info(v ...interface{}) {
68-
logger.writeLog(fmt.Sprint(v...), "info")
67+
func (logger *fileLogger) Info(v interface{}) {
68+
logger.writeLog(fmt.Sprint(v), "info")
6969
}
70-
func (logger *fileLogger) Warn(v ...interface{}) {
71-
logger.writeLog(fmt.Sprint(v...), "warn")
70+
func (logger *fileLogger) Warn(v interface{}) {
71+
logger.writeLog(fmt.Sprint(v), "warn")
7272
}
73-
func (logger *fileLogger) Error(v ...interface{}) {
74-
logger.writeLog(fmt.Sprint(v...), "error")
73+
func (logger *fileLogger) Error(err error, v interface{}) {
74+
logger.writeLog(fmt.Sprint(v, err), "error")
7575
}
7676

7777
func (logger *fileLogger) writeLog(log string, level string) {

‎looptask.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ func (task *LoopTask) GetConfig() *TaskConfig {
3535
func (task *LoopTask) Reset(conf *TaskConfig) error {
3636
if conf.DueTime < 0 {
3737
errmsg := "DueTime is wrong format => must bigger or equal then zero"
38-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "error", errmsg)
38+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "error", errmsg))
3939
return errors.New(errmsg)
4040
}
4141

4242
if conf.Interval <= 0 {
4343
errmsg := "interval is wrong format => must bigger then zero"
44-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "error", errmsg)
44+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "error", errmsg))
4545
return errors.New(errmsg)
4646
}
4747
//restart task
@@ -56,7 +56,7 @@ func (task *LoopTask) Reset(conf *TaskConfig) error {
5656
task.DueTime = conf.DueTime
5757
task.Interval = conf.Interval
5858
task.Start()
59-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "success")
59+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "success"))
6060
return nil
6161
}
6262

@@ -116,7 +116,7 @@ func startLoopTask(task *LoopTask) {
116116
}
117117
//goroutine panic, restart cron task
118118
startLoopTask(task)
119-
task.taskService.Logger().Debug(task.TaskID, " goroutine panic, restart LoopTask")
119+
task.taskService.Logger().Debug(fmt.Sprint(task.TaskID, " goroutine panic, restart LoopTask"))
120120
}
121121
}()
122122
//do log

‎queuetask.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (task *QueueTask) GetConfig() *TaskConfig {
5959
func (task *QueueTask) Reset(conf *TaskConfig) error {
6060
if conf.Interval <= 0 {
6161
errmsg := "interval is wrong format => must bigger then zero"
62-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "error", errmsg)
62+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "error", errmsg))
6363
return errors.New(errmsg)
6464
}
6565

@@ -74,7 +74,7 @@ func (task *QueueTask) Reset(conf *TaskConfig) error {
7474
}
7575
task.Interval = conf.Interval
7676
task.Start()
77-
task.taskService.Logger().Debug("TaskInfo:Reset ", task, conf, "success")
77+
task.taskService.Logger().Debug(fmt.Sprint("TaskInfo:Reset ", task, conf, "success"))
7878
return nil
7979
}
8080

‎taskinfo.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package task
22

33
import (
4+
"fmt"
45
"sync"
56
"time"
67
)
@@ -70,7 +71,7 @@ func (task *TaskInfo) Stop() {
7071
if task.State == TaskState_Run {
7172
task.TimeTicker.Stop()
7273
task.State = TaskState_Stop
73-
task.taskService.Logger().Debug(task.TaskID, " Stop")
74+
task.taskService.Logger().Debug(fmt.Sprint(task.TaskID, " Stop"))
7475
}
7576
}
7677

‎tasks.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ func (service *TaskService) AddTask(t Task) {
282282
service.taskMap[t.TaskID()] = t
283283
service.taskMutex.Unlock()
284284

285-
service.Logger().Info("Task:AddTask => ", t.TaskID(), t.GetConfig())
285+
service.Logger().Info(fmt.Sprint("Task:AddTask => ", t.TaskID(), t.GetConfig()))
286286
}
287287

288288
// RemoveTask remove task by taskid
289289
func (service *TaskService) RemoveTask(taskID string) {
290290
service.taskMutex.Lock()
291291
delete(service.taskMap, taskID)
292292
service.taskMutex.Unlock()
293-
service.Logger().Info("Task:RemoveTask => ", taskID)
293+
service.Logger().Info(fmt.Sprint("Task:RemoveTask => ", taskID))
294294
}
295295

296296
// Count get all task's count
@@ -355,7 +355,7 @@ func (service *TaskService) RemoveAllTask() {
355355
func (service *TaskService) StopAllTask() {
356356
service.Logger().Info("Task:StopAllTask begin...")
357357
for _, v := range service.taskMap {
358-
service.Logger().Info("Task:StopAllTask::StopTask => ", v.TaskID())
358+
service.Logger().Info(fmt.Sprint("Task:StopAllTask::StopTask => ", v.TaskID()))
359359
v.Stop()
360360
}
361361
service.Logger().Info("Task:StopAllTask end[" + string(len(service.taskMap)) + "]")
@@ -372,7 +372,7 @@ func (service *TaskService) StartAllTask() {
372372
}
373373

374374
func (service *TaskService) debugExpress(set *ExpressSet) {
375-
service.Logger().Debug("parseExpress(", set.rawExpress, " , ", set.expressType, ") => ", set.timeMap)
375+
service.Logger().Debug(fmt.Sprint("parseExpress(", set.rawExpress, " , ", set.expressType, ") => ", set.timeMap))
376376
}
377377

378378
func (service *TaskService) defaultLogCounterInfo(ctx *TaskContext) error {

‎version.MD‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
## devfeel/dottask
22

3+
#### Version 0.9.5
4+
* Opt: 修正Logger定义，与dotlog适配
5+
* Opt: 整理代码格式
6+
* 2020-01-05 09:00 at ShangHai
7+
38
#### Version 0.9.4
49
* feature: 新增CreateTask用于根据TaskConfig对象创建对应的Task
510
* Opt: 新增ErrNotSupportTaskType异常变量

0 commit comments

Comments
 (0)