diff --git a/server/controllers/logstreaming_controller.go b/server/controllers/logstreaming_controller.go index 786fa4183..bb2509f06 100644 --- a/server/controllers/logstreaming_controller.go +++ b/server/controllers/logstreaming_controller.go @@ -133,7 +133,7 @@ func (j *JobsController) GetProjectJobsWS(w http.ResponseWriter, r *http.Request pull := projectInfo.String() err = j.ProjectCommandOutputHandler.Receive(pull, receiver, func(msg string) error { - if err := c.WriteMessage(websocket.BinaryMessage, []byte(msg+"\r\n\t")); err != nil { + if err := c.WriteMessage(websocket.BinaryMessage, []byte("\r\n"+msg)); err != nil { j.Logger.Warn("Failed to write ws message: %s", err) return err } diff --git a/server/events/models/models.go b/server/events/models/models.go index 15359b49c..bb91abc02 100644 --- a/server/events/models/models.go +++ b/server/events/models/models.go @@ -35,7 +35,7 @@ import ( const ( planfileSlashReplace = "::" - LogStreamingClearMsg = "\t\n-----Starting New Process-----\n" + LogStreamingClearMsg = "\n-----Starting New Process-----" ) type PullReqStatus struct { diff --git a/server/events/terraform/terraform_client.go b/server/events/terraform/terraform_client.go index eecd7cf0d..2f3a7c15a 100644 --- a/server/events/terraform/terraform_client.go +++ b/server/events/terraform/terraform_client.go @@ -445,7 +445,7 @@ func (c *DefaultClient) RunCommandAsync(ctx models.ProjectCommandContext, path s // Don't stream terraform show output to outCh cmds := strings.Split(tfCmd, " ") if isValidCommand(cmds[1]) { - c.projectCmdOutputHandler.Send(ctx, fmt.Sprintf("\n----- running terraform %s -----\n", args[0])) + c.projectCmdOutputHandler.Send(ctx, fmt.Sprintf("\n----- running terraform %s -----", args[0])) } s := bufio.NewScanner(stdout) for s.Scan() { diff --git a/server/handlers/project_command_output_handler.go b/server/handlers/project_command_output_handler.go index bb1c6cfea..5d91060b8 100644 --- a/server/handlers/project_command_output_handler.go +++ b/server/handlers/project_command_output_handler.go @@ -167,6 +167,11 @@ func (p *AsyncProjectCommandOutputHandler) writeLogLine(pull string, line string } p.receiverBuffersLock.Unlock() + // No need to write to projectOutputBuffers if clear msg. + if line == models.LogStreamingClearMsg { + return + } + p.projectOutputBuffersLock.Lock() if p.projectOutputBuffers[pull] == nil { p.projectOutputBuffers[pull] = []string{}