Merge pull request #1810 from xiaohui/cleanup

cleanup log.*ln and correct typos error

commands/commands.go

@@ -92,10 +92,6 @@ func newProvider(store libmachine.Store) (*libmachine.Provider, error) {
 	return libmachine.New(store)
 }
 
-func getMachineDir(rootPath string) string {
-	return filepath.Join(rootPath, "machines")
-}
-
 func getDefaultStore(rootPath, caCertPath, privateKeyPath string) (libmachine.Store, error) {
 	return libmachine.NewFilestore(
 		rootPath,
@@ -462,7 +458,7 @@ func runActionForeachMachine(actionName string, machines []*libmachine.Host) {
 		serialChan := make(chan error)
 		go machineCommand(actionName, machine, serialChan)
 		if err := <-serialChan; err != nil {
-			log.Errorln(err)
+			log.Error(err)
 		}
 		close(serialChan)
 	}
@@ -472,7 +468,7 @@ func runActionForeachMachine(actionName string, machines []*libmachine.Host) {
 	// rate limit us.
 	for i := 0; i < numConcurrentActions; i++ {
 		if err := <-errorChan; err != nil {
-			log.Errorln(err)
+			log.Error(err)
 		}
 	}
 

commands/commands_test.go

@@ -9,9 +9,6 @@ import (
 	"github.com/docker/machine/drivers/fakedriver"
 	_ "github.com/docker/machine/drivers/none"
 	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/auth"
-	"github.com/docker/machine/libmachine/engine"
-	"github.com/docker/machine/libmachine/swarm"
 	"github.com/docker/machine/state"
 )
 
@@ -74,36 +71,6 @@ func getTestDriverFlags() *DriverOptionsMock {
 	return flags
 }
 
-func getDefaultTestHost() (*libmachine.Host, error) {
-	engineOptions := &engine.EngineOptions{}
-	swarmOptions := &swarm.SwarmOptions{
-		Master:    false,
-		Host:      "",
-		Discovery: "",
-		Address:   "",
-	}
-	authOptions := &auth.AuthOptions{
-		CaCertPath:     hostTestCaCert,
-		PrivateKeyPath: hostTestPrivateKey,
-	}
-	hostOptions := &libmachine.HostOptions{
-		EngineOptions: engineOptions,
-		SwarmOptions:  swarmOptions,
-		AuthOptions:   authOptions,
-	}
-	host, err := libmachine.NewHost(hostTestName, hostTestDriverName, hostOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	flags := getTestDriverFlags()
-	if err := host.Driver.SetConfigFromFlags(flags); err != nil {
-		return nil, err
-	}
-
-	return host, nil
-}
-
 type DriverOptionsMock struct {
 	Data map[string]interface{}
 }

commands/config.go

@@ -43,7 +43,7 @@ func cmdConfig(c *cli.Context) {
 		mParts := strings.Split(mUrl.Host, ":")
 		machineIp := mParts[0]
 
-		dockerHost = fmt.Sprintf("tcp://%s:%s", machineIp, swarmPort)
+		dockerHost = fmt.Sprintf("tcp://%s:%s\n", machineIp, swarmPort)
 	}
 
 	log.Debug(dockerHost)
@@ -74,6 +74,6 @@ func cmdConfig(c *cli.Context) {
 		}
 	}
 
-	fmt.Printf("--tlsverify --tlscacert=%q --tlscert=%q --tlskey=%q -H=%s",
+	fmt.Printf("--tlsverify --tlscacert=%q --tlscert=%q --tlskey=%q -H=%s\n",
 		cfg.caCertPath, cfg.clientCertPath, cfg.clientKeyPath, dockerHost)
 }

log/log.go

@@ -7,7 +7,7 @@ import (
 )
 
 // Why the interface?  We may only want to print to STDOUT and STDERR for now,
-// but it won't neccessarily be that way forever.  This interface is intended
+// but it won't necessarily be that way forever.  This interface is intended
 // to provide a "framework" for a variety of different logging types in the
 // future (log to file, log to logstash, etc.) There could be a driver model
 // similar to what is done with OS or machine providers.
@@ -17,11 +17,9 @@ type Logger interface {
 
 	Error(...interface{})
 	Errorf(string, ...interface{})
-	Errorln(...interface{})
 
 	Info(...interface{})
 	Infof(string, ...interface{})
-	Infoln(...interface{})
 
 	Fatal(...interface{})
 	Fatalf(string, ...interface{})
@@ -72,10 +70,6 @@ func Errorf(fmtString string, args ...interface{}) {
 	l.Errorf(fmtString, args...)
 }
 
-func Errorln(args ...interface{}) {
-	l.Errorln(args...)
-}
-
 func Info(args ...interface{}) {
 	l.Info(args...)
 }
@@ -84,10 +78,6 @@ func Infof(fmtString string, args ...interface{}) {
 	l.Infof(fmtString, args...)
 }
 
-func Infoln(args ...interface{}) {
-	l.Infoln(args...)
-}
-
 func Fatal(args ...interface{}) {
 	l.Fatal(args...)
 }

log/terminal.go

@@ -55,10 +55,6 @@ func (t TerminalLogger) Errorf(fmtString string, args ...interface{}) {
 	t.errf(fmtString, args...)
 }
 
-func (t TerminalLogger) Errorln(args ...interface{}) {
-	t.err(args...)
-}
-
 func (t TerminalLogger) Info(args ...interface{}) {
 	t.log(args...)
 }
@@ -67,10 +63,6 @@ func (t TerminalLogger) Infof(fmtString string, args ...interface{}) {
 	t.logf(fmtString, args...)
 }
 
-func (t TerminalLogger) Infoln(args ...interface{}) {
-	t.log(args...)
-}
-
 func (t TerminalLogger) Fatal(args ...interface{}) {
 	t.err(args...)
 	os.Exit(1)

utils/utils.go

@@ -160,7 +160,7 @@ func GenerateRandomID() string {
 		}
 		value := hex.EncodeToString(id)
 		// if we try to parse the truncated for as an int and we don't have
-		// an error then the value is all numberic and causes issues when
+		// an error then the value is all numeric and causes issues when
 		// used as a hostname. ref #3869
 		if _, err := strconv.ParseInt(TruncateID(value), 10, 64); err == nil {
 			continue