Merge pull request #2161 from balena-io/avoid-headers-already-sent

Device logs: avoid errors related to headers already sent

Author: flowzone-app[bot]

src/features/device-logs/lib/store.ts

@@ -121,11 +121,19 @@ export const storeStream =
 	};
 
 function handleStoreErrors(req: Request, res: Response, err: Error) {
-	if (handleHttpErrors(req, res, err)) {
-		return;
+	if (!(err instanceof errors.HttpError)) {
+		// Log non `HttpError`s regardless of headers state
+		captureException(err, 'Failed to store device logs');
+	}
+	if (res.headersSent) {
+		// If headers are already sent, we can't change the response code so we just end the response
+		res.end();
+	} else {
+		if (handleHttpErrors(req, res, err)) {
+			return;
+		}
+		res.status(500).end();
 	}
-	captureException(err, 'Failed to store device logs');
-	res.status(500).end();
 }
 
 const primaryBackend = await getPrimaryBackend();