Skip to content

Commit

Permalink
refactor(cmd): pinning cli.v1
Browse files Browse the repository at this point in the history
  • Loading branch information
bigeagle committed Nov 19, 2016
1 parent 6225e86 commit add7b93
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
16 changes: 8 additions & 8 deletions cmd/tunasync/tunasync.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"syscall"
"time"

"github.com/codegangsta/cli"
"github.com/gin-gonic/gin"
"github.com/pkg/profile"
"gopkg.in/op/go-logging.v1"
"gopkg.in/urfave/cli.v1"

tunasync "github.com/tuna/tunasync/internal"
"github.com/tuna/tunasync/manager"
Expand All @@ -25,7 +25,7 @@ var (

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"))

cfg, err := manager.LoadConfig(c.String("config"), c)
Expand All @@ -45,9 +45,10 @@ func startManager(c *cli.Context) {

logger.Info("Run tunasync manager server.")
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"))
if !c.Bool("debug") {
gin.SetMode(gin.ReleaseMode)
Expand Down Expand Up @@ -103,6 +104,7 @@ func startWorker(c *cli.Context) {

logger.Info("Run tunasync worker.")
w.Run()
return nil
}

func main() {
Expand All @@ -129,6 +131,8 @@ func main() {
}

app := cli.NewApp()
app.Name = "tunasync"
app.Usage = "tunasync mirror job management tool"
app.EnableBashCompletion = true
app.Version = "0.1"
app.Commands = []cli.Command{
Expand Down Expand Up @@ -158,10 +162,6 @@ func main() {
Name: "key",
Usage: "Use SSL key from `FILE`",
},
cli.StringFlag{
Name: "status-file",
Usage: "Write status file to `FILE`",
},
cli.StringFlag{
Name: "db-file",
Usage: "Use `FILE` as the database file",
Expand Down Expand Up @@ -205,7 +205,7 @@ func main() {
},
cli.BoolFlag{
Name: "debug",
Usage: "Run manager in debug mode",
Usage: "Run worker in debug mode",
},
cli.BoolFlag{
Name: "with-systemd",
Expand Down
4 changes: 3 additions & 1 deletion cmd/tunasynctl/tunasynctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/codegangsta/cli"
"gopkg.in/op/go-logging.v1"
"gopkg.in/urfave/cli.v1"

tunasync "github.com/tuna/tunasync/internal"
)
Expand Down Expand Up @@ -323,6 +323,8 @@ func main() {
app := cli.NewApp()
app.EnableBashCompletion = true
app.Version = "0.1"
app.Name = "tunasynctl"
app.Usage = "control client for tunasync manager"

commonFlags := []cli.Flag{
cli.StringFlag{
Expand Down
2 changes: 1 addition & 1 deletion manager/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package manager

import (
"github.com/BurntSushi/toml"
"github.com/codegangsta/cli"
"gopkg.in/urfave/cli.v1"
)

// A Config is the top-level toml-serializaible config struct
Expand Down
1 change: 1 addition & 0 deletions worker/cgroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func (c *cgroupHook) killAll() error {
return nil
}
for _, pid := range taskList {
// TODO: deal with defunct processes
logger.Debugf("Killing process: %d", pid)
unix.Kill(pid, syscall.SIGKILL)
}
Expand Down

0 comments on commit add7b93

Please sign in to comment.