myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

less verbose command output

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-11-14 09:56:54 +01:00 committed by Juan Font
parent d479234058
commit 8e44596171
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration/hsic/hsic.go
View file

@ -203,8 +203,6 @@ func (t *HeadscaleInContainer) Shutdown() error {
func (t *HeadscaleInContainer) Execute( func (t *HeadscaleInContainer) Execute(
command []string, command []string,
) (string, error) { ) (string, error) {
log.Println("command", command)
log.Printf("running command for %s\n", t.hostname)
stdout, stderr, err := dockertestutil.ExecuteCommand( stdout, stderr, err := dockertestutil.ExecuteCommand(
t.container, t.container,
command, command,
@ -213,11 +211,11 @@ func (t *HeadscaleInContainer) Execute(
if err != nil { if err != nil {
log.Printf("command stderr: %s\n", stderr) log.Printf("command stderr: %s\n", stderr)
return "", err if stdout != "" {
} log.Printf("command stdout: %s\n", stdout)
}
if stdout != "" { return "", err
log.Printf("command stdout: %s\n", stdout)
} }
return stdout, nil return stdout, nil

2
integration/tsic/tsic.go
View file

@ -179,8 +179,6 @@ func (t *TailscaleInContainer) Version() string {
func (t *TailscaleInContainer) Execute( func (t *TailscaleInContainer) Execute(
command []string, command []string,
) (string, string, error) { ) (string, string, error) {
log.Println("command", command)
log.Printf("running command for %s\n", t.hostname)
stdout, stderr, err := dockertestutil.ExecuteCommand( stdout, stderr, err := dockertestutil.ExecuteCommand(
t.container, t.container,
command, command,