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

style: better logging for tunasynctl

Browse Source
This commit is contained in:
bigeagle 2016-04-29 20:36:13 +08:00
parent f8fd1ae460
commit a644294bd7
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/tunasynctl/tunasynctl.go
View File

@ -33,7 +33,6 @@ func initializeWrapper(handler func(*cli.Context)) func(*cli.Context) {
} }
handler(c) handler(c)
} }
} }
func initialize(c *cli.Context) error { func initialize(c *cli.Context) error {
@ -54,7 +53,7 @@ func initialize(c *cli.Context) error {
} else { } else {
baseURL = "https://" + baseURL baseURL = "https://" + baseURL
} }
logger.Info("Use manager address: %s", baseURL) logger.Infof("Use manager address: %s", baseURL)
// create HTTP client // create HTTP client
var err error var err error
@ -72,13 +71,13 @@ func listWorkers(c *cli.Context) {
var workers []tunasync.WorkerStatus var workers []tunasync.WorkerStatus
_, err := tunasync.GetJSON(baseURL+listWorkersPath, &workers, client) _, err := tunasync.GetJSON(baseURL+listWorkersPath, &workers, client)
if err != nil { if err != nil {
logger.Error("Filed to correctly get informations from manager server: %s", err.Error()) logger.Errorf("Filed to correctly get informations from manager server: %s", err.Error())
os.Exit(1) os.Exit(1)
} }
b, err := json.MarshalIndent(workers, "", " ") b, err := json.MarshalIndent(workers, "", " ")
if err != nil { if err != nil {
logger.Error("Error printing out informations: %s", err.Error()) logger.Errorf("Error printing out informations: %s", err.Error())
} }
fmt.Print(string(b)) fmt.Print(string(b))
} }
@ -89,7 +88,7 @@ func listJobs(c *cli.Context) {
if c.Bool("all") { if c.Bool("all") {
_, err := tunasync.GetJSON(baseURL+listJobsPath, &jobs, client) _, err := tunasync.GetJSON(baseURL+listJobsPath, &jobs, client)
if err != nil { if err != nil {
logger.Error("Filed to correctly get information of all jobs from manager server: %s", err.Error()) logger.Errorf("Filed to correctly get information of all jobs from manager server: %s", err.Error())
os.Exit(1) os.Exit(1)
} }
@ -105,7 +104,7 @@ func listJobs(c *cli.Context) {
var workerJobs []tunasync.MirrorStatus var workerJobs []tunasync.MirrorStatus
_, err := tunasync.GetJSON(fmt.Sprintf("%s/workers/%s/jobs", baseURL, workerID), &workerJobs, client) _, err := tunasync.GetJSON(fmt.Sprintf("%s/workers/%s/jobs", baseURL, workerID), &workerJobs, client)
if err != nil { if err != nil {
logger.Error("Filed to correctly get jobs for worker %s: %s", workerID, err.Error()) logger.Errorf("Filed to correctly get jobs for worker %s: %s", workerID, err.Error())
} }
ans <- workerJobs ans <- workerJobs
}(workerID) }(workerID)
@ -117,7 +116,7 @@ func listJobs(c *cli.Context) {
b, err := json.MarshalIndent(jobs, "", " ") b, err := json.MarshalIndent(jobs, "", " ")
if err != nil { if err != nil {
logger.Error("Error printing out informations: %s", err.Error()) logger.Errorf("Error printing out informations: %s", err.Error())
} }
fmt.Printf(string(b)) fmt.Printf(string(b))
} }
@ -146,7 +145,7 @@ func cmdJob(cmd tunasync.CmdVerb) func(*cli.Context) {
} }
resp, err := tunasync.PostJSON(baseURL+cmdPath, cmd, client) resp, err := tunasync.PostJSON(baseURL+cmdPath, cmd, client)
if err != nil { if err != nil {
logger.Error("Failed to correctly send command: %s", err.Error) logger.Errorf("Failed to correctly send command: %s", err.Error())
os.Exit(1) os.Exit(1)
} }
defer resp.Body.Close() defer resp.Body.Close()
@ -154,10 +153,10 @@ func cmdJob(cmd tunasync.CmdVerb) func(*cli.Context) {
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
logger.Error("Failed to parse response: %s", err.Error()) logger.Errorf("Failed to parse response: %s", err.Error())
} }
logger.Error("Failed to correctly send command: HTTP status code is not 200: %s", body) logger.Errorf("Failed to correctly send command: HTTP status code is not 200: %s", body)
} else { } else {
logger.Info("Succesfully send command") logger.Info("Succesfully send command")
} }