Tweak the debug logs for the scp

matteosuppo · matteosuppo · commit 4fb14ba97111 · 2017-06-13T10:27:44.000+02:00
diff --git a/upload/upload.go b/upload/upload.go
@@ -373,9 +373,10 @@ func form(port, board, file string, auth Auth, l Logger) error {
 }
 
 func ssh(port string, files []string, commandline string, auth Auth, l Logger, SSH bool) error {
+	debug(l, "Connect via ssh ", files, commandline)
+
 	// Connect via ssh
 	client, err := simplessh.ConnectWithPassword(port+":22", auth.Username, auth.Password)
-	debug(l, "Connect via ssh ", client, err)
 	if err != nil {
 		return errors.Wrapf(err, "Connect via ssh")
 	}
@@ -389,7 +390,7 @@ func ssh(port string, files []string, commandline string, auth Auth, l Logger, S
 			fileName = "/tmp/" + filepath.Base(file)
 		}
 		err = scp(client, file, fileName)
-		debug(l, "Copy "+file, err)
+		debug(l, "Copy "+file+" to "+fileName+" ", err)
 		if err != nil {
 			return errors.Wrapf(err, "Copy sketch")
 		}

Original file line number	Diff line number	Diff line change
`@@ -373,9 +373,10 @@ func form(port, board, file string, auth Auth, l Logger) error {`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`func ssh(port string, files []string, commandline string, auth Auth, l Logger, SSH bool) error {`
	`376`	`+ debug(l, "Connect via ssh ", files, commandline)`
	`377`	`+`
`376`	`378`	`// Connect via ssh`
`377`	`379`	`client, err := simplessh.ConnectWithPassword(port+":22", auth.Username, auth.Password)`
`378`		`- debug(l, "Connect via ssh ", client, err)`
`379`	`380`	`if err != nil {`
`380`	`381`	`return errors.Wrapf(err, "Connect via ssh")`
`381`	`382`	`}`
`@@ -389,7 +390,7 @@ func ssh(port string, files []string, commandline string, auth Auth, l Logger, S`
`389`	`390`	`fileName = "/tmp/" + filepath.Base(file)`
`390`	`391`	`}`
`391`	`392`	`err = scp(client, file, fileName)`
`392`		`- debug(l, "Copy "+file, err)`
	`393`	`+ debug(l, "Copy "+file+" to "+fileName+" ", err)`
`393`	`394`	`if err != nil {`
`394`	`395`	`return errors.Wrapf(err, "Copy sketch")`
`395`	`396`	`}`