Merge pull request #41 from blp1526/remove_verbose

Remove verbose

Gopkg.toml

@@ -24,9 +24,5 @@
   name = "github.com/urfave/cli"
   version = "1.20.0"
 
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  version = "v1.0.3"
-
 [[constraint]]
   name = "github.com/nsf/termbox-go"

README.md

@@ -42,7 +42,6 @@ $ isac
 |Name|Description|
 |-|-|
 |--unanonymize|unanonymize personal data|
-|--verbose| print debug log|
 |--zones ZONES|set ZONES (separated by ",", example: "is1a,is1b,tk1a")|
 |--help, -h|show help|
 |--version, -v|print the version|

lib/isac.go

@@ -14,7 +14,6 @@ import (
 	"github.com/blp1526/isac/lib/row"
 	"github.com/mattn/go-runewidth"
 	"github.com/nsf/termbox-go"
-	"github.com/sirupsen/logrus"
 )
 
 type Isac struct {
@@ -23,7 +22,6 @@ type Isac struct {
 	config      *config.Config
 	detail      bool
 	unanonymize bool
-	logger      *logrus.Logger
 	row         *row.Row
 	// FIXME: wasteful
 	serverByCurrentRow map[int]server.Server
@@ -33,7 +31,7 @@ type Isac struct {
 	message            string
 }
 
-func New(configPath string, unanonymize bool, verbose bool, zones string) (i *Isac, err error) {
+func New(configPath string, unanonymize bool, zones string) (i *Isac, err error) {
 	config, err := config.New(configPath)
 	if err != nil {
 		return i, err
@@ -42,16 +40,6 @@ func New(configPath string, unanonymize bool, verbose bool, zones string) (i *Is
 	client := api.NewClient(config.AccessToken, config.AccessTokenSecret)
 	row := row.New()
 
-	formatter := &logrus.TextFormatter{
-		FullTimestamp: true,
-	}
-
-	logger := logrus.New()
-	logger.Formatter = formatter
-	if verbose {
-		logger.Level = logrus.DebugLevel
-	}
-
 	zs := []string{config.Zone}
 	if zones != "" {
 		zs = strings.Split(zones, ",")
@@ -62,7 +50,6 @@ func New(configPath string, unanonymize bool, verbose bool, zones string) (i *Is
 		config:      config,
 		detail:      false,
 		unanonymize: unanonymize,
-		logger:      logger,
 		row:         row,
 		zones:       zs,
 		reverseSort: false,
@@ -271,7 +258,7 @@ func (i *Isac) currentServerUp() (message string) {
 	}
 
 	if statusCode != 200 {
-		return fmt.Sprintf(fmt.Sprintf("[ERROR] Request Method: PUT, Request URL: %v, Status Code: %v", url, statusCode))
+		return fmt.Sprintf("[ERROR] Request Method: PUT, Request URL: %v, Status Code: %v", url, statusCode)
 	}
 
 	return fmt.Sprintf("Server.Name %v is booting, wait few seconds, and refresh", s.Name)

main.go

@@ -13,7 +13,6 @@ import (
 const ExitCodeNG = 1
 
 var unanonymize bool
-var verbose bool
 var version string
 var zones string
 
@@ -38,12 +37,6 @@ func main() {
 			Destination: &unanonymize,
 		},
 
-		cli.BoolFlag{
-			Name:        "verbose",
-			Usage:       "print debug log",
-			Destination: &verbose,
-		},
-
 		cli.StringFlag{
 			Name:        "zones",
 			Usage:       "set `ZONES` (separated by \",\", example: \"is1a,is1b,tk1a\")",
@@ -67,7 +60,7 @@ func main() {
 	}
 
 	app.Action = func(c *cli.Context) (err error) {
-		i, err := isac.New(configPath, unanonymize, verbose, zones)
+		i, err := isac.New(configPath, unanonymize, zones)
 		if err != nil {
 			return cli.NewExitError(fmt.Sprintf("%v", err), ExitCodeNG)
 		}