增加gocron命令行管理工具

bugfix#生成压缩包脚本, 当编译失败时, 未及时退出，而是继续往下执行.

README.md

@@ -9,6 +9,7 @@
 * crontab时间表达式，精确到秒
 * 任务执行失败重试设置
 * 任务超时设置
+* 延时任务
 * 任务执行方式
     * 调用本机系统命令  
     * 通过SSH执行远程命令
@@ -47,11 +48,16 @@
 3. 编译 `go build`
 4. 启动、访问方式同上
 
-### 启动可选参数
+### 命令
 
-* -p 端口, 指定端口, 默认5920
-* -e 指定运行环境, dev|test|prod, dev模式下可查看更多日志信息, 默认prod
-* -h 查看帮助
+* gocron web
+    * -p 端口, 指定端口, 默认5920
+    * -e 指定运行环境, dev|test|prod, dev模式下可查看更多日志信息, 默认prod
+    * -d 后台运行
+    * -h 查看帮助
+* gocron serv 
+    * -s stop|status stop:停止gocron status:查看运行状态
+    
 
 ## 安全
 * 使用`https`访问保证数据传输安全, 可在web服务器如nginx中配置https，通过反向代理，访问内部的gocron

build.sh

@@ -53,8 +53,13 @@ if [[ $ARCH != '386' && $ARCH != 'amd64' ]];then
 fi
 
 echo '开始编译'
-GOOS=$OS GOARCH=$ARCH go build
-if [[ ! $? ]];then
+if [[ $OS = 'windows' ]];then
+    GOOS=$OS GOARCH=$ARCH go build -ldflags '-w -H windowsgui'
+else
+    GOOS=$OS GOARCH=$ARCH go build -ldflags '-w'
+fi
+
+if [[ $? != 0 ]];then
     exit 1
 fi
 echo '编译完成'
@@ -68,7 +73,7 @@ else
 fi
 
 mkdir -p $TEMP_DIR/$APP_NAME
-if [[ ! $? ]]; then
+if [[ $? != 0 ]]; then
     exit 1
 fi
 

cmd/serv.go

@@ -0,0 +1,67 @@
+package cmd
+
+import (
+    "github.com/urfave/cli"
+    "fmt"
+    "github.com/ouqiang/gocron/modules/utils"
+    "github.com/ouqiang/gocron/modules/app"
+    "os"
+    "syscall"
+)
+
+var CmdServ = cli.Command{
+    Name:   "serv",
+    Usage:  "manage gocron, ./gocron serv -s stop|status",
+    Action: runServ,
+    Flags: []cli.Flag{
+        cli.StringFlag{
+            Name: "s",
+            Value:"",
+            Usage: "stop|status",
+        },
+    },
+}
+
+func runServ(ctx *cli.Context)  {
+    if utils.IsWindows() {
+        fmt.Println("not support on windows")
+        return
+    }
+    option := ctx.String("s")
+    if !utils.InStringSlice([]string{"stop", "status"}, option) {
+        fmt.Println("invalid option")
+        return
+    }
+    app.InitEnv()
+    pid := app.GetPid()
+    if pid <= 0 {
+        fmt.Println("not running")
+        return
+    }
+    process ,err := os.FindProcess(pid)
+    if err != nil {
+        fmt.Println("not running", err)
+        return
+    }
+    switch option {
+        case "stop":
+            stop(process)
+        case "status":
+            status(process)
+    }
+}
+
+func stop(process *os.Process)  {
+    fmt.Println("stopping gocron......")
+    err := process.Signal(syscall.SIGTERM)
+    if err != nil {
+        fmt.Println("failed to kill process", err)
+    } else {
+        fmt.Println("stopped")
+    }
+}
+
+
+func status(process *os.Process)  {
+    fmt.Printf("running, pid-[%d]\n", process.Pid)
+}

cmd/web.go

@@ -13,48 +13,88 @@ import (
     "github.com/ouqiang/gocron/models"
     "github.com/ouqiang/gocron/modules/setting"
     "time"
+    "io"
+    "fmt"
+    "path/filepath"
+    "os/exec"
+    "github.com/ouqiang/gocron/modules/utils"
 )
 
 // web服务器默认端口
 const DefaultPort = 5920
 
+const InitProcess = 1
+
 var CmdWeb = cli.Command{
     Name:   "web",
     Usage:  "run web server",
-    Action: run,
+    Action: runWeb,
     Flags: []cli.Flag{
         cli.IntFlag{
             Name:  "port,p",
             Value: DefaultPort,
-            Usage: "bind port number",
+            Usage: "bind port",
         },
         cli.StringFlag{
             Name: "env,e",
             Value: "prod",
             Usage: "runtime environment, dev|test|prod",
         },
+        cli.BoolFlag{
+            Name: "d",
+            Usage: "-d=true, run as daemon process",
+        },
     },
 }
 
-func run(ctx *cli.Context) {
+func runWeb(ctx *cli.Context) {
+    // 设置守护进程
+    becomeDaemon(ctx)
     // 设置运行环境
     setEnvironment(ctx)
     // 初始化应用
     app.InitEnv()
+    app.WritePid()
     // 初始化模块 DB、定时任务等
     initModule()
     // 捕捉信号,配置热更新等
     go catchSignal()
-    m := macaron.Classic()
+    m := macaron.NewWithLogger(getWebLogWriter())
 
     // 注册路由
     routers.Register(m)
     // 注册中间件.
     routers.RegisterMiddleware(m)
     port := parsePort(ctx)
+    fmt.Println("server start")
     m.Run(port)
 }
 
+func becomeDaemon(ctx *cli.Context) {
+    // 不支持windows
+    if utils.IsWindows() {
+        return
+    }
+    if !ctx.IsSet("d") {
+        return
+    }
+
+    if os.Getppid() == InitProcess {
+        // 子进程不再处理
+        return
+    }
+
+    filePath, _:= filepath.Abs(os.Args[0])
+    cmd := exec.Command(filePath, os.Args[1:]...)
+    cmd.Stdin = os.Stdin
+    cmd.Stdout = os.Stdout
+    cmd.Stderr = os.Stderr
+    cmd.Start()
+
+    // 父进程退出, 子进程由init-1号进程收养
+    os.Exit(0)
+}
+
 func initModule()  {
     if !app.Installed {
         return
@@ -71,6 +111,27 @@ func initModule()  {
     // 初始化定时任务
     serviceTask := new(service.Task)
     serviceTask.Initialize()
+
+    // 初始化延时任务
+    delayTaskEnabled, err := config.Key("delay.task.enable").Bool()
+    if err != nil {
+        return
+    }
+    if !delayTaskEnabled {
+        return
+    }
+    delayTaskSlots, err := config.Key("delay.task.slots").Int()
+    if err != nil {
+        return
+    }
+    delayTaskTick := config.Key("delay.task.tick").String()
+    tick, err := time.ParseDuration(delayTaskTick)
+    if err != nil {
+        return
+    }
+
+    serviceDelayTask := new(service.DelayTask)
+    serviceDelayTask.Initialize(tick, delayTaskSlots)
 }
 
 // 解析端口
@@ -119,15 +180,43 @@ func catchSignal()  {
     }
 }
 
+func getWebLogWriter() io.Writer  {
+    if macaron.Env == macaron.DEV {
+        return os.Stdout
+    }
+    logFile := app.LogDir + "/access.log"
+    var err error
+    w, err := os.OpenFile(logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND ,0666)
+    if err != nil {
+        fmt.Printf("日志文件[%s]打开失败", logFile)
+        panic(err)
+    }
+
+    return w
+}
+
+// 应用退出
 func shutdown()  {
-    if !app.Installed {
+    defer func() {
+        app.RemovePid()
+        logger.Info("已退出")
         os.Exit(0)
+    }()
+
+    if !app.Installed {
         return
     }
-    logger.Info("应用准备退出, 停止任务调度")
+    logger.Info("应用准备退出")
     serviceTask := new(service.Task)
     // 停止所有任务调度
+    logger.Info("停止定时任务调度")
     serviceTask.StopAll()
+    delayTaskEnable, _ := app.Setting.Key("delay.task.enable").Bool()
+    if delayTaskEnable {
+        logger.Info("停止延时任务调度")
+        serviceDelayTask := new(service.DelayTask)
+        serviceDelayTask.Stop()
+    }
     taskNumInRunning := service.TaskNum.Num()
     logger.Infof("正在运行的任务有%d个", taskNumInRunning)
     if taskNumInRunning > 0 {
@@ -140,6 +229,4 @@ func shutdown()  {
         time.Sleep(3 * time.Second)
         taskNumInRunning = service.TaskNum.Num()
     }
-    logger.Info("已退出")
-    os.Exit(0)
 }

gocron.go

@@ -13,7 +13,7 @@ import (
     "github.com/ouqiang/gocron/cmd"
 )
 
-const AppVersion = "0.1"
+const AppVersion = "0.3"
 
 func main() {
     app := cli.NewApp()
@@ -22,6 +22,7 @@ func main() {
     app.Version = AppVersion
     app.Commands = []cli.Command{
         cmd.CmdWeb,
+        cmd.CmdServ,
     }
     app.Flags = append(app.Flags, []cli.Flag{}...)
     app.Run(os.Args)

models/delay_task.go

@@ -0,0 +1,85 @@
+package models
+
+import (
+    "time"
+    "github.com/go-xorm/xorm"
+)
+
+
+// 延迟任务
+type DelayTask struct {
+    Id       int64     `xorm:"bigint pk autoincr"`
+    Url      string    `xorm:"varchar(128) not null"`
+    Params   string    `xorm:"varchar(256) not null default '' "`
+    Delay  int       `xorm:"mediumint notnull default 0"` // 延迟时间
+    Status   Status    `xorm:"tinyint notnull index(u_status_created) default 5"` // 状态 0:执行失败 1:执行中 2:执行成功 5: 待执行
+    Created  time.Time `xorm:"datetime notnull created index(u_status_created)"`
+    Updated  time.Time `xorm:"datetime updated"`
+    BaseModel `xorm:"-"`
+}
+
+func (task *DelayTask) Create() (insertId int64, err error) {
+    _, err = Db.Insert(task)
+    if err == nil {
+        insertId = task.Id
+    }
+
+    return
+}
+
+// 获取所有待执行任务
+func (task *DelayTask) ActiveList(endTime time.Time) ([]DelayTask, error) {
+    list := make([]DelayTask, 0)
+    fields := "id,url,params,delay,created"
+    err := Db.Where("status = ? AND created <= ?", Waiting, endTime.Format(DefaultTimeFormat)).Cols(fields).Limit(task.PageSize, task.pageLimitOffset()).Find(&list)
+
+    return list, err
+}
+
+// 获取待执行任务数量
+func (task *DelayTask) ActiveNum(endTime time.Time) (int, error) {
+    count ,err := Db.Where("status = ? AND created <= ?", Waiting, endTime.Format(DefaultTimeFormat)).Count(task)
+
+    return int(count), err
+}
+
+func (task *DelayTask) List(params CommonMap) ([]DelayTask, error) {
+    task.parsePageAndPageSize(params)
+    list := make([]DelayTask, 0)
+    session := Db.Desc("id")
+    task.parseWhere(session, params)
+    err := session.Limit(task.PageSize, task.pageLimitOffset()).Find(&list)
+
+    return list, err
+}
+
+
+// 更新任务状态
+func (task *DelayTask) UpdateStatus(id int64, status Status) (int64, error) {
+    return Db.Table(task).Id(id).Update(CommonMap{
+        "status": status,
+    })
+}
+
+// 解析where
+func (task *DelayTask) parseWhere(session *xorm.Session, params CommonMap)  {
+    if len(params) == 0 {
+        return
+    }
+    status, ok := params["Status"]
+    if ok && status.(int) > -1 {
+        session.And("status = ?", status)
+    }
+}
+
+// 删除N个月前的日志
+func (task *DelayTask) Remove(id int) (int64, error) {
+    t := time.Now().AddDate(0, -id, 0)
+    return Db.Where("created <= ?", t.Format(DefaultTimeFormat)).Delete(task)
+}
+
+func (task *DelayTask) Total(params CommonMap) (int64, error) {
+    session := Db.NewSession()
+    task.parseWhere(session, params)
+    return session.Count(task)
+}

models/migration.go

@@ -15,7 +15,7 @@ func (migration *Migration) Exec(dbName string) error {
     setting := new(Setting)
     task := new(Task)
     tables := []interface{}{
-        &User{}, task, &TaskLog{}, &Host{}, setting,&LoginLog{},
+        &User{}, task, &DelayTask{}, &TaskLog{}, &Host{}, setting,&LoginLog{},
     }
     for _, table := range tables {
         exist, err:= Db.IsTableExist(table)

models/model.go

@@ -26,6 +26,7 @@ const (
     Finish   Status = 2 // 完成
     Cancel   Status = 3 // 取消
     Background Status = 4 // 后台运行
+    Waiting Status  = 5 // 等待中
 )
 
 const (

modules/app/app.go

@@ -7,6 +7,8 @@ import (
     "runtime"
     "github.com/ouqiang/gocron/modules/utils"
     "gopkg.in/ini.v1"
+    "io/ioutil"
+    "strconv"
 )
 
 var (
@@ -17,8 +19,10 @@ var (
     AppConfig    string // 应用配置文件
     Installed    bool   // 应用是否安装过
     Setting      *ini.Section // 应用配置
+    PidFile      string
 )
 
+
 func InitEnv() {
     runtime.GOMAXPROCS(runtime.NumCPU())
     logger.InitLogger()
@@ -31,6 +35,7 @@ func InitEnv() {
     LogDir = AppDir + "/log"
     DataDir = AppDir + "/data"
     AppConfig = ConfDir + "/app.ini"
+    PidFile = LogDir + "/gocron.pid"
     checkDirExists(ConfDir, LogDir, DataDir)
     Installed = IsInstalled()
 }
@@ -45,6 +50,33 @@ func IsInstalled() bool {
     return true
 }
 
+func WritePid()  {
+    pid := os.Getpid()
+    pidStr := strconv.Itoa(pid)
+    err := ioutil.WriteFile(PidFile, []byte(pidStr), 0644)
+    if err != nil {
+        logger.Fatalf("写入pid文件失败", err)
+    }
+}
+
+func GetPid() int {
+    bytes, err := ioutil.ReadFile(PidFile)
+    if err != nil {
+        return 0
+    }
+    pidStr := string(bytes)
+    pid, err := strconv.Atoi(pidStr)
+    if err != nil {
+        return 0
+    }
+
+    return pid
+}
+
+func RemovePid()  {
+    os.Remove(PidFile)
+}
+
 // 创建安装锁文件
 func CreateInstallLock() error {
     _, err := os.Create(ConfDir + "/install.lock")

modules/httpclient/http_client.go

@@ -25,7 +25,18 @@ func Get(url string, timeout int) ResponseWrapper {
     return request(req, timeout)
 }
 
-func PostBody(url string, body string, timeout int) ResponseWrapper {
+func PostParams(url string,params string, timeout int) ResponseWrapper {
+    buf := bytes.NewBufferString(params)
+    req, err := http.NewRequest("POST", url, buf)
+    if err != nil {
+        return createRequestError(err)
+    }
+    req.Header.Set("Content-type", "application/x-www-form-urlencoded")
+
+    return request(req, timeout)
+}
+
+func PostJson(url string, body string, timeout int) ResponseWrapper {
     buf := bytes.NewBufferString(body)
     req, err := http.NewRequest("POST", url, buf)
     if err != nil {

modules/notify/slack.go

@@ -43,7 +43,7 @@ func (slack *Slack) send(msg Message, slackUrl string, channel string)  {
     maxTimes := 3
     i := 0
     for i < maxTimes {
-        resp := httpclient.PostBody(slackUrl, formatBody, timeout)
+        resp := httpclient.PostJson(slackUrl, formatBody, timeout)
         if resp.StatusCode == 200 {
             break;
         }

routers/delaytask/delay_task.go

@@ -0,0 +1,110 @@
+package delaytask
+
+import (
+    "gopkg.in/macaron.v1"
+    "github.com/ouqiang/gocron/models"
+    "github.com/ouqiang/gocron/modules/utils"
+    "strings"
+    "github.com/ouqiang/gocron/service"
+    "github.com/ouqiang/gocron/modules/logger"
+    "github.com/Unknwon/paginater"
+    "fmt"
+    "github.com/ouqiang/gocron/routers/base"
+    "html/template"
+    "github.com/ouqiang/gocron/modules/app"
+)
+
+func Index(ctx *macaron.Context)  {
+    delayTaskModel := new(models.DelayTask)
+    queryParams := parseQueryParams(ctx)
+    total, err := delayTaskModel.Total(queryParams)
+    tasks, err := delayTaskModel.List(queryParams)
+    if err != nil {
+        logger.Error(err)
+    }
+    PageParams := fmt.Sprintf("status=%d&page_size=%d",
+        queryParams["Status"], queryParams["PageSize"]);
+    queryParams["PageParams"] = template.URL(PageParams)
+    p := paginater.New(int(total), queryParams["PageSize"].(int), queryParams["Page"].(int), 5)
+    ctx.Data["Pagination"] = p
+    ctx.Data["Title"] = "延时任务列表"
+    ctx.Data["Tasks"] = tasks
+    ctx.Data["Params"] = queryParams
+    ctx.HTML(200, "task/delay_task")
+}
+
+func Create(ctx *macaron.Context) string {
+    url := ctx.QueryTrim("url")
+    params := ctx.QueryTrim("params")
+    delay := ctx.QueryInt("delay")
+    json := utils.JsonResponse{}
+    delayTaskEnabled, _ := app.Setting.Key("delay.task.enable").Bool()
+    if !delayTaskEnabled {
+        return json.CommonFailure("系统未开启延时任务")
+    }
+    if url == ""  {
+        return json.CommonFailure("url地址不能为空")
+    }
+    lowerUrl := strings.ToLower(url)
+    if !strings.HasPrefix(lowerUrl, "http") &&
+        !strings.HasPrefix(lowerUrl, "https") {
+        return json.CommonFailure("无效的url地址")
+    }
+    if len(url) > 128 {
+        return json.CommonFailure("url长度不能超过128")
+    }
+    maxDelay := 1 << 31
+    if delay <= 0 || delay > maxDelay {
+        return json.CommonFailure("无效的delay, 取值范围1-(2^31-1)")
+    }
+    if len(params) > 256 {
+        return json.CommonFailure("params长度不能超过256")
+    }
+
+    delayTask := new(models.DelayTask)
+    delayTask.Url = url
+    delayTask.Params = params
+    delayTask.Delay = delay
+    delayTask.Status = models.Waiting
+    _, err := delayTask.Create()
+
+    if err != nil {
+        return json.CommonFailure("添加失败", err)
+    }
+
+    logger.Infof("新增延时任务#id-%d#url-%s#params-%s#delay-%d",
+        delayTask.Id, delayTask.Url, delayTask.Params, delayTask.Delay)
+    delayTaskService := new(service.DelayTask)
+    delayTaskService.Add(*delayTask)
+
+    return json.Success("添加成功", nil)
+}
+
+// 删除N个月前的日志
+func Remove(ctx *macaron.Context) string {
+    month := ctx.ParamsInt(":id")
+    json := utils.JsonResponse{}
+    if month < 1 || month > 12 {
+        return json.CommonFailure("参数取值范围1-12")
+    }
+    delayTaskModel := new(models.DelayTask)
+    _, err := delayTaskModel.Remove(month)
+    if err != nil {
+        return json.CommonFailure("删除失败", err)
+    }
+
+    return json.Success("删除成功", nil)
+}
+
+// 解析查询参数
+func parseQueryParams(ctx *macaron.Context) (models.CommonMap) {
+    var params models.CommonMap = models.CommonMap{}
+    status := ctx.QueryInt("status")
+    if status >=0 {
+        status -= 1
+    }
+    params["Status"] = status
+    base.ParsePageAndPageSize(ctx, params)
+
+    return params
+}

routers/install/install.go

@@ -113,6 +113,9 @@ func writeConfig(form InstallForm) error {
         "db.charset":  "utf8",
         "allow_ips" : "",
         "app.name": "定时任务管理系统", // 应用名称
+        "delay.task.enable": "false", // 是否开启延时任务
+        "delay.task.slots": "3600", // 时间轮槽数量
+        "delay.task.tick": "1s", // 时间轮每次转动的时间
     }
 
     return setting.Write(dbConfig, app.AppConfig)

routers/routers.go

@@ -17,6 +17,7 @@ import (
     "github.com/go-macaron/gzip"
     "github.com/ouqiang/gocron/routers/manage"
     "github.com/ouqiang/gocron/routers/loginlog"
+    "github.com/ouqiang/gocron/routers/delaytask"
 )
 
 // 静态文件目录
@@ -43,7 +44,7 @@ func Register(m *macaron.Macaron) {
         m.Post("/editPassword", user.UpdatePassword)
     })
 
-    // 任务
+    // 定时任务
     m.Group("/task", func() {
         m.Get("/create", task.Create)
         m.Post("/store", binding.Bind(task.TaskForm{}), task.Store)
@@ -57,6 +58,11 @@ func Register(m *macaron.Macaron) {
         m.Get("/run/:id", task.Run)
     })
 
+    // 延时任务
+    m.Group("/delaytask", func() {
+        m.Get("", delaytask.Index)
+    })
+
     // 主机
     m.Group("/host", func() {
         m.Get("/create", host.Create)
@@ -91,6 +97,8 @@ func Register(m *macaron.Macaron) {
     m.Group("/api/v1", func() {
        m.Route("/tasklog/update-status", "GET,POST", tasklog.UpdateStatus)
        m.Post("/tasklog/remove/:id", tasklog.Remove)
+       m.Post("/delaytask/push", delaytask.Create)
+       m.Post("/delaytask/log/remove/:id", delaytask.Remove)
     });
 
     // 404错误

service/delay_task.go

@@ -0,0 +1,120 @@
+package service
+
+import (
+    "github.com/ouqiang/gocron/models"
+    "time"
+    "github.com/ouqiang/gocron/modules/logger"
+    "math"
+    "github.com/ouqiang/gocron/modules/httpclient"
+    "strings"
+    "github.com/ouqiang/timewheel"
+)
+
+var tw  *timewheel.TimeWheel
+
+type DelayTask struct {}
+
+// 从数据库中取出所有延迟任务
+func (task *DelayTask) Initialize(tick time.Duration, slots int)  {
+    tw = timewheel.New(tick, slots, task.Run)
+    tw.Start()
+    taskModel := new(models.DelayTask)
+    currentTime := time.Now()
+    taskNum, err := taskModel.ActiveNum(currentTime)
+    if err != nil {
+        logger.Error("延迟任务初始化#获取待执行的任务失败", err)
+        return
+    }
+    if taskNum == 0 {
+        logger.Debugf("延迟任务初始化#待执行的任务数量为0")
+        return
+    }
+    pageSize := 100
+    totalPage := int( math.Ceil(float64(taskNum) / float64(pageSize)) )
+    logger.Infof("延迟任务初始化#待执行的任务数量-%d#共%d页#每页取%d条", taskNum, totalPage, pageSize)
+    taskModel.PageSize = pageSize
+    for page := 1; page <= totalPage; page++ {
+        taskModel.Page = page
+        logger.Debugf("延迟任务初始化#取出任务列表#第%d页", page)
+        taskList, err := taskModel.ActiveList(currentTime)
+        if err != nil {
+            logger.Error("延迟任务初始化#获取任务列表失败", err)
+        }
+        task.BatchAdd(taskList)
+    }
+    logger.Info("延迟任务初始化完成")
+}
+
+// 批量添加任务
+func (task *DelayTask) BatchAdd(taskList []models.DelayTask)  {
+    for _, item := range(taskList) {
+        task.Add(item)
+    }
+}
+
+// 添加任务
+func (task *DelayTask) Add(taskModel models.DelayTask)  {
+    currentTimestamp := time.Now().Unix()
+    execTimestamp := taskModel.Created.Unix() + int64(taskModel.Delay)
+    // 时间过期, 立即执行任务
+    data := []interface{}{taskModel.Id, taskModel.Url, taskModel.Params}
+    if execTimestamp <= currentTimestamp {
+        go task.Run(data)
+        return
+    }
+    delay := execTimestamp - currentTimestamp
+    tw.Add(time.Duration(delay) * time.Second, data)
+}
+
+// 运行任务
+func (task *DelayTask) Run(data []interface{})  {
+    if len(data) < 3 {
+        logger.Errorf("延时任务开始执行#参数不足#%+v", data)
+        return
+    }
+    id := data[0].(int64)
+    url := data[1].(string)
+    params := data[2].(string)
+    if id <= 0 || url == "" {
+        logger.Errorf("延时任务开始执行#参数为空#%+v", data)
+        return
+    }
+    taskModel := new(models.DelayTask)
+    _, err := taskModel.UpdateStatus(id, models.Running)
+    if err != nil {
+        logger.Error("延迟任务开始执行#更新任务状态失败", err)
+        return
+    }
+    timeout := 300
+    tryTimes := 3
+    success := false
+    logger.Infof("延迟任务开始执行#id-%d#url-%s#params-%s", id, url, params)
+    for i := 0; i < tryTimes; {
+        response := httpclient.PostParams(url, params, timeout)
+        if response.StatusCode == 200 && strings.TrimSpace(response.Body) == "success"{
+            success = true
+            break;
+        }
+        i++
+        if i < tryTimes {
+            logger.Errorf("延迟任务执行失败#重试第%d次#任务Id-%d#HTTP状态码-%d#HTTP-BODY-%s",
+            i,id,response.StatusCode,response.Body)
+            time.Sleep(30 * time.Second)
+        }
+    }
+    logger.Infof("延迟任务执行完成#id-%d", id)
+    var status models.Status
+    if success {
+        status = models.Finish
+    } else {
+        status = models.Failure
+    }
+    _ ,err = taskModel.UpdateStatus(id, status)
+    if err != nil {
+        logger.Error("延迟任务执行完成#更新任务状态失败", err)
+    }
+}
+
+func (task *DelayTask) Stop()  {
+    tw.Stop()
+}

templates/task/delay_task.html

@@ -0,0 +1,84 @@
+{{{ template "common/header" . }}}
+<style type="text/css">
+  pre {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    padding:10px;
+    background-color: #4C4C4C;
+    color: white;
+  }
+</style>
+<div class="ui grid">
+  <!--the vertical menu-->
+  {{{ template "task/menu" . }}}
+
+  <div class="twelve wide column">
+    <div class="pageHeader">
+      <div class="segment">
+        <h3 class="ui dividing header">
+          <div class="content">
+          </div>
+        </h3>
+      </div>
+    </div>
+    <form class="ui form">
+      <div class="fields search">
+        <div class="field">
+          <select name="status">
+            <option value="0">任务状态</option>
+            <option value="1" {{{if eq .Params.Status 0}}}selected{{{end}}} >失败</option>
+            <option value="2" {{{if eq .Params.Status 1}}}selected{{{end}}}>执行中</option>
+            <option value="3" {{{if eq .Params.Status 2}}}selected{{{end}}}>成功</option>
+            <option value="6" {{{if eq .Params.Status 5}}}selected{{{end}}}>待执行</option>
+          </select>
+        </div>
+        <div class="field">
+          <button class="ui linkedin submit button">搜索</button>
+        </div>
+      </div>
+    </form>
+    <table class="ui pink table">
+      <thead>
+      <tr>
+        <th>任务ID</th>
+        <th>URL</th>
+        <th>参数</th>
+        <th>延迟时间</th>
+        <th>创建时间</th>
+        <th>完成时间</th>
+        <th>状态</th>
+      </tr>
+      </thead>
+      <tbody>
+      {{{range $i, $v := .Tasks}}}
+      <tr>
+        <td>{{{.Id}}}</td>
+        <td>{{{.Url}}}</td>
+        <td>{{{.Params}}}</td>
+        <td>{{{.Delay}}}秒</td>
+        <td>{{{.Created.Format "2006-01-02 15:04:05" }}}</td>
+        <td>
+          {{{if or (eq .Status 0) (eq .Status 2) }}}
+            {{{.Updated.Format "2006-01-02 15:04:05" }}}
+          {{{end}}}
+        </td>
+        <td>
+          {{{if eq .Status 2}}}
+          成功
+          {{{else if eq .Status 1}}}
+          <span style="color:green">执行中</span>
+          {{{else if eq .Status 0}}}
+          <span style="color:red">失败</span>
+          {{{else if eq .Status 5}}}
+          <span style="color:#43A102">待执行</span>
+          {{{end}}}
+        </td>
+      </tr>
+      {{{end}}}
+      </tbody>
+    </table>
+    {{{ template "common/pagination" .}}}
+  </div>
+</div>
+
+{{{ template "common/footer" . }}}

templates/task/index.html

@@ -41,7 +41,7 @@
                 <div class="field">
                     <select name="status">
                         <option value="0">状态</option>
-                        <option value="1" {{{if eq .Params.Status 0}}}selected{{{end}}} >暂停</option>
+                        <option value="1" {{{if eq .Params.Status 0}}}selected{{{end}}} >停止</option>
                         <option value="2" {{{if eq .Params.Status 1}}}selected{{{end}}}>激活</option>
                     </select>
                 </div>
@@ -50,43 +50,50 @@
                 </div>
             </div>
         </form>
-    <div class="task-list">
-        {{{range $i, $v := .Tasks}}}
-                   <div class="ui device two column middle aligned vertical grid segment">
-                       <div class="column verborder">
-                           <div class="ui info segment">
-                               <h5 class="ui header">{{{.Task.Name}}} {{{if eq .Status 1}}}<i class="large checkmark blue icon"></i> {{{else}}} <i class="large red minus icon"></i> {{{end}}}
-                               </h5>
-                               <p>任务ID： <span class="stress">{{{.Id}}}</span></p>
-                               <p>状态： <span class="stress">{{{if eq .Status 1}}}激活{{{else}}}停止{{{end}}}</span></p>
-                               <p>cron表达式： {{{.Spec}}}</p>
-                               <p>执行方式: {{{if eq .Protocol 1}}} HTTP {{{else if eq .Protocol 2}}} SSH {{{else if eq .Protocol 3}}}本地命令{{{end}}}</p>
-                               <p class="sensorStatus">命令：{{{.Command}}}</p>
-                               <p class="sensorStatus">超时时间：{{{if eq .Timeout -1}}}后台运行{{{else if gt .Timeout 0}}}{{{.Timeout}}}秒{{{else}}}不限制{{{end}}}</p>
-                               <p>重试次数: {{{.RetryTimes}}}</p>
-                               <p class="sensorStatus">是否允许多实例运行：{{{if gt .Multi 0}}}是{{{else}}}否{{{end}}}</p>
-                               {{{if eq .Protocol 2}}}
-                               <p>主机: {{{.Alias}}}-{{{.Name}}}</p>
-                               {{{end}}}
-                               <p>备注: {{{.Remark}}}</p>
-                           </div>
-                       </div>
-                       <div class="center aligned column">
-                           <div class="ui buttons operation">
-                               <a class="ui purple  button" href="/task/edit/{{{.Id}}}">编辑</a>
-                               {{{if eq .Status 1}}}
-                               <button class="ui primary button" @click="changeStatus({{{.Id}}},{{{.Status}}})">停止</button>
-                               {{{else}}}
-                               <button class="ui blue button" @click="changeStatus({{{.Id}}},{{{.Status}}})">激活 </button>
-                               {{{end}}}
-                               <button class="ui positive button" @click="remove({{{.Id}}})">删除</button> <br>
-                               <button class="ui twitter button" @click="run({{{.Id}}})">手动运行</button>
-                               <a class="ui instagram button" href="/task/log?task_id={{{.Id}}}">查看日志</a>
-                           </div>
-                       </div>
-                   </div>
-        {{{end}}}
-    </div>
+        <table class="ui pink table task-list">
+            <thead>
+            <tr>
+                <th>任务ID</th>
+                <th>任务名称</th>
+                <th>cron表达式</th>
+                <th>执行方式</th>
+                <th>超时时间</th>
+                <th>重试次数</th>
+                <th>单实例运行</th>
+                <th>主机</th>
+                <th>状态</th>
+                <th>操作</th>
+            </tr>
+            </thead>
+            <tbody>
+                {{{range $i, $v := .Tasks}}}
+                    <tr>
+                        <td>{{{.Id}}}</td>
+                        <td>{{{.Task.Name}}}</td>
+                        <td>{{{.Spec}}}</td>
+                        <td>{{{if eq .Protocol 1}}} HTTP {{{else if eq .Protocol 2}}} SSH {{{else if eq .Protocol 3}}}本地命令{{{end}}}</td>
+                        <td>{{{if eq .Timeout -1}}}后台运行{{{else if gt .Timeout 0}}}{{{.Timeout}}}秒{{{else}}}不限制{{{end}}}</td>
+                        <td>{{{.RetryTimes}}}</td>
+                        <td>{{{if gt .Multi 0}}}否{{{else}}}是{{{end}}}</td>
+                        <td>{{{.Alias}}}-{{{.Name}}}</td>
+                        <td>{{{if eq .Status 1}}}<span style="color: green;">激活</span>{{{else}}}<span style="color: red;">停止<span>{{{end}}}</td>
+                        <td>
+                            <div class="ui buttons operation">
+                                <a class="ui purple  button" href="/task/edit/{{{.Id}}}">编辑</a>
+                                {{{if eq .Status 1}}}
+                                <button class="ui primary button" @click="changeStatus({{{.Id}}},{{{.Status}}})">停止</button>
+                                {{{else}}}
+                                <button class="ui blue button" @click="changeStatus({{{.Id}}},{{{.Status}}})">激活 </button>
+                                {{{end}}}
+                                <button class="ui positive button" @click="remove({{{.Id}}})">删除</button> <br>
+                                <button class="ui twitter button" @click="run({{{.Id}}})">手动运行</button>
+                                <a class="ui instagram button" href="/task/log?task_id={{{.Id}}}">查看日志</a>
+                            </div>
+                        </td>
+                    </tr>
+            {{{end}}}
+            </tbody>
+        </table>
     {{{ template "common/pagination" .}}}
     </div>
 </div>

templates/task/log.html

@@ -42,7 +42,7 @@
                         <option value="2" {{{if eq .Params.Status 1}}}selected{{{end}}}>执行中</option>
                         <option value="3" {{{if eq .Params.Status 2}}}selected{{{end}}}>成功</option>
                         <option value="4" {{{if eq .Params.Status 3}}}selected{{{end}}}>取消</option>
-                        <option value="5" {{{if eq .Params.Status 3}}}selected{{{end}}}>后台运行</option>
+                        <option value="5" {{{if eq .Params.Status 4}}}selected{{{end}}}>后台运行</option>
                     </select>
                 </div>
                 <div class="field">

upload_package_to_qiniu.sh

@@ -11,7 +11,7 @@ fi
 for i in linux darwin windows
 do
     ./build.sh -p $i
-    if [[ ! $? ]];then
+    if [[ $? != 0 ]];then
         break
     fi
 done
@@ -25,7 +25,7 @@ do
     # 上传文件 qrsctl put bucket  key srcFile
     KEY=gocron/$i
     qrsctl put github $KEY $i
-    if [[ ! $? ]];then
+    if [[ $? != 0 ]];then
         break
     fi
     echo "刷新七牛CDN-" $QINIU_URL/$KEY

vendor/github.com/go-xorm/xorm/engine.go

@@ -252,7 +252,9 @@ func (engine *Engine) Close() error {
 func (engine *Engine) Ping() error {
 	session := engine.NewSession()
 	defer session.Close()
-	engine.logger.Infof("PING DATABASE %v", engine.DriverName())
+	if engine.showSQL {
+		engine.logger.Infof("PING DATABASE %v", engine.DriverName())
+	}
 	return session.Ping()
 }
 

vendor/github.com/ouqiang/timewheel/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 qiang.ou
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/github.com/ouqiang/timewheel/README.md

@@ -0,0 +1,40 @@
+# timewheel
+Golang实现的时间轮
+
+
+![时间轮](https://raw.githubusercontent.com/ouqiang/timewheel/master/timewheel.jpg)
+
+# 安装
+
+```shell
+go get -u github.com/ouqiang/timewheel
+```
+
+# 使用
+
+```go
+package main
+
+import (
+    "github.com/ouqiang/timewheel"
+    "time"
+)
+
+func main()  {
+    // tick刻度为1秒, 3600个槽
+    tw := timewheel.New(1 * time.Second, 3600)
+    tw.Start()
+    tw.Add(5 * time.Second, func() {
+        // do something
+    })
+    tw.Add(10 * time.Minute, func() {
+        // do something
+    })
+    tw.Add(35 * time.Hour, func() {
+        // do something
+    })
+    // 停止
+    tw.Stop()
+}
+```
+

vendor/github.com/ouqiang/timewheel/timewheel.go

@@ -0,0 +1,126 @@
+package timewheel
+
+import (
+    "time"
+    "container/list"
+)
+
+// @author qiang.ou<qingqianludao@gmail.com>
+
+type Job func([]interface{})
+
+type TimeWheel struct {
+    interval time.Duration
+    ticker *time.Ticker
+    slots []*list.List
+    currentPos int
+    slotNum int
+    job Job
+    taskChannel chan Task
+    stopChannel chan bool
+}
+
+
+type Task struct {
+    delay time.Duration
+    circle int
+    data []interface{}
+}
+
+func New(interval time.Duration, slotNum int, job Job) *TimeWheel {
+    if  interval <= 0 || slotNum <= 0 || job == nil {
+        return nil
+    }
+    tw := &TimeWheel{
+        interval: interval,
+        slots: make([]*list.List, slotNum),
+        currentPos: 0,
+        job: job,
+        slotNum: slotNum,
+        taskChannel: make(chan Task),
+        stopChannel: make(chan bool),
+    }
+
+    tw.initSlots()
+
+    return tw
+}
+
+func (tw *TimeWheel) initSlots()  {
+    for i := 0; i < tw.slotNum; i++ {
+        tw.slots[i] = list.New()
+    }
+}
+
+func (tw *TimeWheel) Start()  {
+    tw.ticker = time.NewTicker(tw.interval)
+    go tw.start()
+}
+
+func (tw *TimeWheel) Add(delay time.Duration, data []interface{})  {
+    if delay <= 0  {
+        return
+    }
+    tw.taskChannel <- Task{delay:delay, data: data}
+}
+
+func (tw *TimeWheel) Stop()  {
+    tw.stopChannel <- true
+}
+
+func (tw *TimeWheel) start()  {
+    for {
+        select {
+        case <- tw.ticker.C:
+            tw.tickHandler()
+        case task := <- tw.taskChannel:
+            tw.addTask(&task)
+        case <- tw.stopChannel:
+            tw.ticker.Stop()
+            return
+        }
+    }
+}
+
+func (tw *TimeWheel) tickHandler()  {
+    l := tw.slots[tw.currentPos]
+    tw.scanAndRunTask(l)
+    if tw.currentPos == tw.slotNum - 1 {
+        tw.currentPos = 0
+    } else {
+        tw.currentPos++
+    }
+}
+
+func (tw *TimeWheel) scanAndRunTask(l *list.List)  {
+    for e := l.Front(); e != nil; {
+        task := e.Value.(*Task)
+        if task.circle > 0 {
+            task.circle--
+            e = e.Next()
+            continue
+        }
+
+        go tw.job(task.data)
+        next := e.Next()
+        l.Remove(e)
+        e = next
+    }
+}
+
+func (tw *TimeWheel) addTask(task *Task)  {
+    pos, circle := tw.getPositionAndCircle(task.delay)
+    task.circle = circle
+
+    tw.slots[pos].PushBack(task)
+}
+
+func (tw *TimeWheel) getPositionAndCircle(d time.Duration) (pos int, circle int) {
+    delaySeconds := int(d.Seconds())
+    intervalSeconds := int(tw.interval.Seconds())
+    circle = int(delaySeconds / intervalSeconds /  tw.slotNum)
+    pos = int(tw.currentPos + delaySeconds / intervalSeconds) % tw.slotNum
+
+
+    return
+}

vendor/vendor.json

@@ -132,6 +132,12 @@
 			"revision": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
 			"revisionTime": "2016-03-02T07:53:16Z"
 		},
+		{
+			"checksumSHA1": "kIFW+u9fHefC8sWE4W9pYIfJv5k=",
+			"path": "github.com/ouqiang/timewheel",
+			"revision": "c28ec761087c32fd75ad7514db2a4988d5c872d9",
+			"revisionTime": "2017-05-14T12:16:09Z"
+		},
 		{
 			"checksumSHA1": "1keN4Q9F8uHk/Gt5YXG0oCEecKM=",
 			"path": "github.com/urfave/cli",