diff --git a/internal/executor/executor.go b/internal/executor/executor.go index 92e4847..ef652e1 100644 --- a/internal/executor/executor.go +++ b/internal/executor/executor.go @@ -200,8 +200,8 @@ func stepExec(req *ExecutionRequest) bool { cmd.Wait() - //req.logEntry.Stdout = req.logEntry.StdoutBuffer.String() - //req.logEntry.Stderr = req.logEntry.StderrBuffer.String() + // req.logEntry.Stdout = req.logEntry.StdoutBuffer.String() + // req.logEntry.Stderr = req.logEntry.StderrBuffer.String() req.logEntry.ExecutionCompleted = true req.logEntry.ExitCode = int32(cmd.ProcessState.ExitCode()) diff --git a/internal/httpservers/websocket.go b/internal/httpservers/websocket.go index c0ef7a1..17e922c 100644 --- a/internal/httpservers/websocket.go +++ b/internal/httpservers/websocket.go @@ -1,12 +1,12 @@ package httpservers import ( - "time" + "context" log "github.com/sirupsen/logrus" "net/http" "nhooyr.io/websocket" "nhooyr.io/websocket/wsjson" - "context" + "time" ) func handleWebsocket(w http.ResponseWriter, r *http.Request) bool { @@ -34,7 +34,6 @@ func handleWebsocket(w http.ResponseWriter, r *http.Request) bool { return false } - c.Close(websocket.StatusNormalClosure, "") return true } diff --git a/internal/httpservers/webuiServer_test.go b/internal/httpservers/webuiServer_test.go index a4843b7..57aab5a 100644 --- a/internal/httpservers/webuiServer_test.go +++ b/internal/httpservers/webuiServer_test.go @@ -1,16 +1,16 @@ package httpservers import ( + config "github.com/OliveTin/OliveTin/internal/config" "github.com/stretchr/testify/assert" "os" "testing" - config "github.com/OliveTin/OliveTin/internal/config" ) func TestGetWebuiDir(t *testing.T) { os.Chdir("../../") // go test sets the cwd to "httpservers" by default - cfg = config.DefaultConfig(); + cfg = config.DefaultConfig() dir := findWebuiDir()