summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sidor <m.sidor@samsung.com>2018-10-11 15:30:20 +0200
committerMichal Sidor <m.sidor@samsung.com>2018-10-11 15:30:20 +0200
commit1693e580066c35c2d761c2b7af3d4dc40dc05751 (patch)
tree39ea95338efb1c7a956eba873a41319181eb3fa2
parentb70ea80dc6e891b9c8a786aae9bd9752ce019a90 (diff)
downloadweles-sandbox/msidor/srun_demo_1810.tar.gz
weles-sandbox/msidor/srun_demo_1810.tar.bz2
weles-sandbox/msidor/srun_demo_1810.zip
Add very temporary heavy SSH loggingsandbox/msidor/srun_demo_1810
Change-Id: Ic49c1d8cb1fc985629c010f6c99af650aaa38cdf
-rw-r--r--manager/dryad/session_provider.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/manager/dryad/session_provider.go b/manager/dryad/session_provider.go
index 35d9865..6feab6f 100644
--- a/manager/dryad/session_provider.go
+++ b/manager/dryad/session_provider.go
@@ -20,7 +20,9 @@ import (
"bytes"
"context"
"fmt"
+ "io"
"log"
+ "os"
"strings"
"time"
@@ -91,6 +93,7 @@ func (d *sessionProvider) newSession() (*ssh.Session, error) {
}
func (d *sessionProvider) executeRemoteCommand(cmd string) ([]byte, []byte, error) {
+ log.Print(cmd)
session, err := d.newSession()
if err != nil {
return nil, nil, err
@@ -102,10 +105,11 @@ func (d *sessionProvider) executeRemoteCommand(cmd string) ([]byte, []byte, erro
}()
var stdout, stderr bytes.Buffer
- session.Stdout = &stdout
- session.Stderr = &stderr
+ session.Stdout = io.MultiWriter(&stdout, os.Stderr)
+ session.Stderr = io.MultiWriter(&stderr, os.Stderr)
err = session.Run(cmd)
+ log.Print(err)
return stdout.Bytes(), stderr.Bytes(), err
}
@@ -137,6 +141,7 @@ func (d *sessionProvider) Exec(cmd ...string) ([]byte, []byte, error) {
err = d.sshfs.check(session)
if err != nil {
+ log.Print(err)
return nil, nil, err
}