opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1066 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-ssh-raw-run to release/2.6.0

Browse Source 
* commit 'fb5e60c8fe873283c458b62592ba8e0f3530a1d4':
  util/ssh: add RawRun to get cmd output directly.
This commit is contained in:
邱剑
2019-02-16 22:22:14 +08:00
parent 4fa0f7216d fb5e60c8fe
commit 94ea861a3d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/ssh/ssh.go
+13 -1
View File
@@ -94,7 +94,15 @@ func (s *Client) GetConfig() ClientConfig {
return s.config
}
func (s *Client) RawRun(cmds ...string) ([]string, error) {
return s.run(false, cmds...)
}
func (s *Client) Run(cmds ...string) ([]string, error) {
return s.run(true, cmds...)
}
func (s *Client) run(parseOutput bool, cmds ...string) ([]string, error) {
ret := []string{}
for _, cmd := range cmds {
session, err := s.client.NewSession()
@@ -113,7 +121,11 @@ func (s *Client) Run(cmds ...string) ([]string, error) {
log.Errorf("%v", err)
return nil, err
}
ret = append(ret, ParseOutput(stdOut.Bytes())...)
if parseOutput {
ret = append(ret, ParseOutput(stdOut.Bytes())...)
} else {
ret = append(ret, stdOut.String())
}
}
return ret, nil