From 4e52012d43ade916949e1bfbfb1a564bab5092e2 Mon Sep 17 00:00:00 2001 From: Shingo Kawamura Date: Sun, 23 Jul 2017 21:58:49 +0900 Subject: [PATCH] Add log.SetFlags(0) --- api/api.go | 3 --- color/color.go | 9 +++++++++ logger/logger.go | 27 --------------------------- main.go | 8 ++++---- 4 files changed, 13 insertions(+), 34 deletions(-) create mode 100644 color/color.go delete mode 100644 logger/logger.go diff --git a/api/api.go b/api/api.go index 09c9599..167fc3a 100644 --- a/api/api.go +++ b/api/api.go @@ -9,7 +9,6 @@ import ( "time" "github.com/blp1526/scv/config" - "github.com/blp1526/scv/logger" ) type Body struct { @@ -34,7 +33,6 @@ func Request(body *Body, zoneName string, serverName string) error { serverId = scv.Servers[i].ID } } - logger.Debug(fmt.Sprintf("Server ID: %s", serverId)) if serverId == "" { return fmt.Errorf("ServerID is not found by ZoneName %s and ServerName %s", zoneName, serverName) @@ -45,7 +43,6 @@ func Request(body *Body, zoneName string, serverName string) error { host := "secure.sakura.ad.jp" path := "/cloud/zone/" + zoneName + "/api/cloud/1.1/server/" + serverId + "/vnc/proxy" url := scheme + "://" + host + path - logger.Debug(fmt.Sprintf("URL: %s", url)) req, err := http.NewRequest("GET", url, nil) if err != nil { diff --git a/color/color.go b/color/color.go new file mode 100644 index 0000000..98741ff --- /dev/null +++ b/color/color.go @@ -0,0 +1,9 @@ +package color + +func Red(msg string) string { + return format("\033[31m", msg) +} + +func format(color string, msg string) string { + return color + msg + "\033[m" +} diff --git a/logger/logger.go b/logger/logger.go deleted file mode 100644 index 2f817c4..0000000 --- a/logger/logger.go +++ /dev/null @@ -1,27 +0,0 @@ -package logger - -import ( - "fmt" -) - -const normal = "\033[m" -const black = "\033[30m" -const red = "\033[31m" -const green = "\033[32m" -const yellow = "\033[33m" -const blue = "\033[34m" -const magenta = "\033[35m" -const cyan = "\033[36m" -const lightGray = "\033[37m" - -func Debug(msg string) { - fmt.Println(format(lightGray, "debug", msg)) -} - -func Fatal(msg string) { - fmt.Println(format(red, "fatal", msg)) -} - -func format(color string, level string, msg string) string { - return fmt.Sprintf("%s%s%s: %s", color, level, normal, msg) -} diff --git a/main.go b/main.go index bad9904..e66a5b9 100644 --- a/main.go +++ b/main.go @@ -2,17 +2,17 @@ package main import ( "fmt" - "os" + "log" "github.com/blp1526/scv/cmd" - "github.com/blp1526/scv/logger" + "github.com/blp1526/scv/color" ) func main() { msg, err := cmd.Run() if err != nil { - logger.Fatal(fmt.Sprintf("%s", err)) - os.Exit(1) + log.SetFlags(0) + log.Fatal(color.Red(fmt.Sprintf("fatal: %s", err))) } else { fmt.Println(msg) }