diff --git a/cmd/web.go b/cmd/web.go index 518ccf8..4e12761 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -6,7 +6,9 @@ import ( "github.com/go-macaron/gzip" "github.com/go-macaron/session" "github.com/go-macaron/csrf" - "scheduler/modules/app" + "github.com/ouqiang/cron-scheduler/modules/app" + "fmt" + "os" ) // web服务器默认端口 @@ -43,6 +45,8 @@ func run(ctx *cli.Context) { // 定时任务调度 func runScheduler() { + fmt.Println("hello world") + os.Exit(1) } // 路由注册 diff --git a/main.go b/main.go new file mode 100644 index 0000000..f59b0ab --- /dev/null +++ b/main.go @@ -0,0 +1,28 @@ +package main + +/*-------------------------------------------------------- + 定时任务调度 + 兼容Linux crontab时间格式语法,最小粒度可精确到每秒 + 支持通过HTTP、SSH协议触发任务执行 +--------------------------------------------------------*/ + +import ( + "github.com/urfave/cli" + "os" + + "github.com/ouqiang/cron-scheduler/cmd" +) + +const AppVersion = "0.0.1" + +func main() { + app := cli.NewApp() + app.Name = "scheduler" + app.Usage = "schedule cron service" + app.Version = AppVersion + app.Commands = []cli.Command{ + cmd.CmdWeb, + } + app.Flags = append(app.Flags, []cli.Flag{}...) + app.Run(os.Args) +} diff --git a/models/model.go b/models/model.go index 4b0235a..4984876 100644 --- a/models/model.go +++ b/models/model.go @@ -3,7 +3,7 @@ package models import ( "github.com/go-xorm/xorm" "fmt" - "scheduler/modules/setting" + "github.com/ouqiang/cron-scheduler/modules/setting" "github.com/go-xorm/core" _ "github.com/go-sql-driver/mysql" "gopkg.in/macaron.v1" diff --git a/models/user.go b/models/user.go index e2540be..b8cb073 100644 --- a/models/user.go +++ b/models/user.go @@ -2,7 +2,7 @@ package models import ( "time" - "scheduler/modules/utils" + "github.com/ouqiang/cron-scheduler/modules/utils" ) const PasswordSaltLength = 6; diff --git a/modules/ansible/ansible.go b/modules/ansible/ansible.go index 48a11a4..71f7065 100644 --- a/modules/ansible/ansible.go +++ b/modules/ansible/ansible.go @@ -4,10 +4,10 @@ package ansible import ( "os" - "scheduler/modules/utils" "errors" "gopkg.in/yaml.v2" "io/ioutil" + "github.com/ouqiang/cron-scheduler/modules/utils" ) type Handler map[string]interface{} diff --git a/modules/ansible/host.go b/modules/ansible/host.go index 87d0b59..ad8eef4 100644 --- a/modules/ansible/host.go +++ b/modules/ansible/host.go @@ -1,7 +1,7 @@ package ansible import ( - "scheduler/models" + "github.com/ouqiang/cron-scheduler/models" "sync" "io/ioutil" "bytes" diff --git a/modules/app/app.go b/modules/app/app.go index 7764847..a5b5f55 100644 --- a/modules/app/app.go +++ b/modules/app/app.go @@ -2,11 +2,12 @@ package app import ( "os" - "scheduler/modules/crontask" - "scheduler/models" "runtime" - "scheduler/modules/utils" - "scheduler/modules/ansible" + + "github.com/ouqiang/cron-scheduler/modules/utils" + "github.com/ouqiang/cron-scheduler/modules/ansible" + "github.com/ouqiang/cron-scheduler/modules/crontask" + "github.com/ouqiang/cron-scheduler/models" ) var ( diff --git a/service/task.go b/service/task.go index 1de99c8..0c076cf 100644 --- a/service/task.go +++ b/service/task.go @@ -1,13 +1,13 @@ package service import ( - "scheduler/models" - "scheduler/modules/utils" + "github.com/ouqiang/cron-scheduler/models" + "github.com/ouqiang/cron-scheduler/modules/utils" "net/http" "io/ioutil" "strconv" "time" - "scheduler/modules/crontask" + "github.com/ouqiang/cron-scheduler/modules/crontask" ) type Task struct {} diff --git a/vendor/vendor.json b/vendor/vendor.json index c9bdb21..acecfe9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -107,5 +107,5 @@ "revisionTime": "2017-02-08T14:18:51Z" } ], - "rootPath": "scheduler" + "rootPath": "cron-scheduler" }