yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-20 20:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cmd): pinning cli.v1

Browse Source
This commit is contained in:
bigeagle 2016-11-19 23:57:56 +08:00
parent 6225e86d12
commit add7b936e3
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/tunasync/tunasync.go
View File

@ -8,10 +8,10 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/codegangsta/cli"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/pkg/profile" "github.com/pkg/profile"
"gopkg.in/op/go-logging.v1" "gopkg.in/op/go-logging.v1"
"gopkg.in/urfave/cli.v1"
tunasync "github.com/tuna/tunasync/internal" tunasync "github.com/tuna/tunasync/internal"
"github.com/tuna/tunasync/manager" "github.com/tuna/tunasync/manager"
@ -25,7 +25,7 @@ var (
var logger = logging.MustGetLogger("tunasync") var logger = logging.MustGetLogger("tunasync")
func startManager(c *cli.Context) { func startManager(c *cli.Context) error {
tunasync.InitLogger(c.Bool("verbose"), c.Bool("debug"), c.Bool("with-systemd")) tunasync.InitLogger(c.Bool("verbose"), c.Bool("debug"), c.Bool("with-systemd"))
cfg, err := manager.LoadConfig(c.String("config"), c) cfg, err := manager.LoadConfig(c.String("config"), c)
@ -45,9 +45,10 @@ func startManager(c *cli.Context) {
logger.Info("Run tunasync manager server.") logger.Info("Run tunasync manager server.")
m.Run() m.Run()
return nil
} }
func startWorker(c *cli.Context) { func startWorker(c *cli.Context) error {
tunasync.InitLogger(c.Bool("verbose"), c.Bool("debug"), c.Bool("with-systemd")) tunasync.InitLogger(c.Bool("verbose"), c.Bool("debug"), c.Bool("with-systemd"))
if !c.Bool("debug") { if !c.Bool("debug") {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
@ -103,6 +104,7 @@ func startWorker(c *cli.Context) {
logger.Info("Run tunasync worker.") logger.Info("Run tunasync worker.")
w.Run() w.Run()
return nil
} }
func main() { func main() {
@ -129,6 +131,8 @@ func main() {
} }
app := cli.NewApp() app := cli.NewApp()
app.Name = "tunasync"
app.Usage = "tunasync mirror job management tool"
app.EnableBashCompletion = true app.EnableBashCompletion = true
app.Version = "0.1" app.Version = "0.1"
app.Commands = []cli.Command{ app.Commands = []cli.Command{
@ -158,10 +162,6 @@ func main() {
Name: "key", Name: "key",
Usage: "Use SSL key from `FILE`", Usage: "Use SSL key from `FILE`",
}, },
cli.StringFlag{
Name: "status-file",
Usage: "Write status file to `FILE`",
},
cli.StringFlag{ cli.StringFlag{
Name: "db-file", Name: "db-file",
Usage: "Use `FILE` as the database file", Usage: "Use `FILE` as the database file",
@ -205,7 +205,7 @@ func main() {
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "debug", Name: "debug",
Usage: "Run manager in debug mode", Usage: "Run worker in debug mode",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "with-systemd", Name: "with-systemd",

4
cmd/tunasynctl/tunasynctl.go
View File

@ -11,8 +11,8 @@ import (
"time" "time"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/codegangsta/cli"
"gopkg.in/op/go-logging.v1" "gopkg.in/op/go-logging.v1"
"gopkg.in/urfave/cli.v1"
tunasync "github.com/tuna/tunasync/internal" tunasync "github.com/tuna/tunasync/internal"
) )
@ -323,6 +323,8 @@ func main() {
app := cli.NewApp() app := cli.NewApp()
app.EnableBashCompletion = true app.EnableBashCompletion = true
app.Version = "0.1" app.Version = "0.1"
app.Name = "tunasynctl"
app.Usage = "control client for tunasync manager"
commonFlags := []cli.Flag{ commonFlags := []cli.Flag{
cli.StringFlag{ cli.StringFlag{

2
manager/config.go
View File

@ -2,7 +2,7 @@ package manager
import ( import (
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/codegangsta/cli" "gopkg.in/urfave/cli.v1"
) )
// A Config is the top-level toml-serializaible config struct // A Config is the top-level toml-serializaible config struct

1
worker/cgroup.go
View File

@ -116,6 +116,7 @@ func (c *cgroupHook) killAll() error {
return nil return nil
} }
for _, pid := range taskList { for _, pid := range taskList {
// TODO: deal with defunct processes
logger.Debugf("Killing process: %d", pid) logger.Debugf("Killing process: %d", pid)
unix.Kill(pid, syscall.SIGKILL) unix.Kill(pid, syscall.SIGKILL)
} }