Fix startup log wrapping

kylecarbs · kylecarbs · commit c48658c57861 · 2023-03-23T04:38:12.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -778,9 +778,7 @@ func (a *agent) trackScriptLogs(ctx context.Context, reader io.Reader) (chan str
 	// coming in.
 	logsFinished := make(chan struct{})
 	err := a.trackConnGoroutine(func() {
-		buffer := make([]byte, 0, 1<<20)
 		scanner := bufio.NewScanner(reader)
-		scanner.Buffer(buffer, 1<<20)
 		for scanner.Scan() {
 			queueLog(agentsdk.StartupLog{
 				CreatedAt: database.Now(),
diff --git a/site/src/components/Logs/Logs.tsx b/site/src/components/Logs/Logs.tsx
@@ -99,9 +99,9 @@ const useStyles = makeStyles<
     wordBreak: "break-all",
     color: theme.palette.text.primary,
     fontFamily: MONOSPACE_FONT_FAMILY,
-    height: logLineHeight,
+    height: ({ lineNumbers }) => (lineNumbers ? logLineHeight : "auto"),
     // Whitespace is significant in terminal output for alignment
-    whiteSpace: "pre-line",
+    whiteSpace: "pre",
     padding: theme.spacing(0, 3),
 
     "&.error": {
