@@ -135,7 +135,6 @@ class ContainerLogger extends EventEmitter {
135
135
// { end = false } on the stepLoggerWritableStream because there is only one instance of it for all the steps.
136
136
this . handledStreams ++ ;
137
137
let stdoutStream = stdout
138
- . pipe ( new DeprecatedImagesInterceptorStream ( ) )
139
138
. pipe ( this . _logSizeLimitStream ( ) )
140
139
. pipe ( this . stepLogger . createMaskingStream ( ) ) ;
141
140
@@ -186,37 +185,47 @@ class ContainerLogger extends EventEmitter {
186
185
187
186
_handleTtyStream ( stream , isError ) {
188
187
this . handledStreams ++ ;
189
- const deprecatedImagesInterceptor = new DeprecatedImagesInterceptorStream ( true ) ;
188
+ const deprecatedImagesInterceptor = isError && new DeprecatedImagesInterceptorStream ( true ) ;
190
189
stream . on ( 'end' , ( ) => {
191
190
this . _handleFinished ( ) ;
192
- deprecatedImagesInterceptor . end ( ) ;
191
+ if ( isError ) {
192
+ deprecatedImagesInterceptor . end ( ) ;
193
+ }
193
194
} ) ;
194
195
stream . on ( 'data' , ( chunk ) => {
195
- deprecatedImagesInterceptor . write ( chunk ) ;
196
+ if ( isError ) {
197
+ deprecatedImagesInterceptor . write ( chunk ) ;
198
+ }
196
199
this . _logMessage ( Buffer . from ( chunk ) . toString ( 'utf-8' ) , isError ) ;
197
200
} ) ;
198
201
logger . info ( `Listening on stream 'data' event for container: ${ this . containerId } ` ) ;
199
202
}
200
203
201
204
_handleNonTtyStream ( stream , isError ) {
202
205
this . handledStreams ++ ;
203
- const deprecatedImagesInterceptor = new DeprecatedImagesInterceptorStream ( true ) ;
206
+ const deprecatedImagesInterceptor = isError && new DeprecatedImagesInterceptorStream ( true ) ;
204
207
stream . on ( 'readable' , ( ) => {
205
208
let header = stream . read ( 8 ) ;
206
209
while ( header !== null ) {
207
- deprecatedImagesInterceptor . write ( header ) ;
210
+ if ( isError ) {
211
+ deprecatedImagesInterceptor . write ( header ) ;
212
+ }
208
213
const payload = stream . read ( header . readUInt32BE ( 4 ) ) ;
209
214
if ( payload === null ) {
210
215
break ;
211
216
}
212
- deprecatedImagesInterceptor . write ( payload ) ;
217
+ if ( isError ) {
218
+ deprecatedImagesInterceptor . write ( payload ) ;
219
+ }
213
220
this . _logMessage ( Buffer . from ( payload ) . toString ( 'utf8' ) , isError ) ;
214
221
header = stream . read ( 8 ) ;
215
222
}
216
223
} ) ;
217
224
stream . on ( 'end' , ( ) => {
218
225
this . _handleFinished ( ) ;
219
- deprecatedImagesInterceptor . end ( ) ;
226
+ if ( isError ) {
227
+ deprecatedImagesInterceptor . end ( ) ;
228
+ }
220
229
} ) ;
221
230
logger . info ( `Listening on stream 'readable' event for container: ${ this . containerId } ` ) ;
222
231
}
0 commit comments