mirror of
https://github.com/juanfont/headscale.git
synced 2024-11-25 02:55:29 +00:00
1e61084898
* handle control protocol through websocket The necessary behaviour is already in place, but the wasm build only issued GETs, and the handler was not invoked. * get DERP-over-websocket working for wasm clients * Prepare for testing builtin websocket-over-DERP Still needs some way to assert that clients are connected through websockets, rather than the TCP hijacking version of DERP. * integration tests: properly differentiate between DERP transports * do not touch unrelated code * linter fixes * integration testing: unexport common implementation of derp server scenario * fixup! integration testing: unexport common implementation of derp server scenario * dockertestutil/logs: remove unhelpful comment * update changelog --------- Co-authored-by: Csaba Sarkadi <sarkadicsa@tutanota.de>
79 lines
1.4 KiB
Go
79 lines
1.4 KiB
Go
package dockertestutil
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"io"
|
|
"log"
|
|
"os"
|
|
"path"
|
|
|
|
"github.com/ory/dockertest/v3"
|
|
"github.com/ory/dockertest/v3/docker"
|
|
)
|
|
|
|
const filePerm = 0o644
|
|
|
|
func WriteLog(
|
|
pool *dockertest.Pool,
|
|
resource *dockertest.Resource,
|
|
stdout io.Writer,
|
|
stderr io.Writer,
|
|
) error {
|
|
return pool.Client.Logs(
|
|
docker.LogsOptions{
|
|
Context: context.TODO(),
|
|
Container: resource.Container.ID,
|
|
OutputStream: stdout,
|
|
ErrorStream: stderr,
|
|
Tail: "all",
|
|
RawTerminal: false,
|
|
Stdout: true,
|
|
Stderr: true,
|
|
Follow: false,
|
|
Timestamps: false,
|
|
},
|
|
)
|
|
}
|
|
|
|
func SaveLog(
|
|
pool *dockertest.Pool,
|
|
resource *dockertest.Resource,
|
|
basePath string,
|
|
) (string, string, error) {
|
|
err := os.MkdirAll(basePath, os.ModePerm)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
|
|
var stdout, stderr bytes.Buffer
|
|
err = WriteLog(pool, resource, &stdout, &stderr)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
|
|
log.Printf("Saving logs for %s to %s\n", resource.Container.Name, basePath)
|
|
|
|
stdoutPath := path.Join(basePath, resource.Container.Name+".stdout.log")
|
|
err = os.WriteFile(
|
|
stdoutPath,
|
|
stdout.Bytes(),
|
|
filePerm,
|
|
)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
|
|
stderrPath := path.Join(basePath, resource.Container.Name+".stderr.log")
|
|
err = os.WriteFile(
|
|
stderrPath,
|
|
stderr.Bytes(),
|
|
filePerm,
|
|
)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
|
|
return stdoutPath, stderrPath, nil
|
|
}
|