Skip to content

Commit 105689c

Browse files
committed
fix: parse only stderr
1 parent cff9226 commit 105689c

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

lib/ContainerLogger.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ class ContainerLogger extends EventEmitter {
135135
// { end = false } on the stepLoggerWritableStream because there is only one instance of it for all the steps.
136136
this.handledStreams++;
137137
let stdoutStream = stdout
138-
.pipe(new DeprecatedImagesInterceptorStream())
139138
.pipe(this._logSizeLimitStream())
140139
.pipe(this.stepLogger.createMaskingStream());
141140

@@ -186,37 +185,47 @@ class ContainerLogger extends EventEmitter {
186185

187186
_handleTtyStream(stream, isError) {
188187
this.handledStreams++;
189-
const deprecatedImagesInterceptor = new DeprecatedImagesInterceptorStream(true);
188+
const deprecatedImagesInterceptor = isError && new DeprecatedImagesInterceptorStream(true);
190189
stream.on('end', () => {
191190
this._handleFinished();
192-
deprecatedImagesInterceptor.end();
191+
if (isError) {
192+
deprecatedImagesInterceptor.end();
193+
}
193194
});
194195
stream.on('data', (chunk) => {
195-
deprecatedImagesInterceptor.write(chunk);
196+
if (isError) {
197+
deprecatedImagesInterceptor.write(chunk);
198+
}
196199
this._logMessage(Buffer.from(chunk).toString('utf-8'), isError);
197200
});
198201
logger.info(`Listening on stream 'data' event for container: ${this.containerId}`);
199202
}
200203

201204
_handleNonTtyStream(stream, isError) {
202205
this.handledStreams++;
203-
const deprecatedImagesInterceptor = new DeprecatedImagesInterceptorStream(true);
206+
const deprecatedImagesInterceptor = isError && new DeprecatedImagesInterceptorStream(true);
204207
stream.on('readable', () => {
205208
let header = stream.read(8);
206209
while (header !== null) {
207-
deprecatedImagesInterceptor.write(header);
210+
if (isError) {
211+
deprecatedImagesInterceptor.write(header);
212+
}
208213
const payload = stream.read(header.readUInt32BE(4));
209214
if (payload === null) {
210215
break;
211216
}
212-
deprecatedImagesInterceptor.write(payload);
217+
if (isError) {
218+
deprecatedImagesInterceptor.write(payload);
219+
}
213220
this._logMessage(Buffer.from(payload).toString('utf8'), isError);
214221
header = stream.read(8);
215222
}
216223
});
217224
stream.on('end', () => {
218225
this._handleFinished();
219-
deprecatedImagesInterceptor.end();
226+
if (isError) {
227+
deprecatedImagesInterceptor.end();
228+
}
220229
});
221230
logger.info(`Listening on stream 'readable' event for container: ${this.containerId}`);
222231
}

0 commit comments

Comments
 (0)