File tree Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ exports.handler = ({id}) =>
14
14
return ;
15
15
}
16
16
17
- console . log ( chalk . bold ( 'Getting logs for deployment:' ) , id ) ;
17
+ console . log ( chalk . bold ( 'Getting logs for deployment:' ) , id , '\n' ) ;
18
18
19
19
// services request url
20
20
const remoteUrl = `${ userConfig . endpoint } /logs/${ id } ` ;
@@ -46,17 +46,21 @@ exports.handler = ({id}) =>
46
46
const d = buf . toString ( ) ;
47
47
const lines = d . split ( '\n' ) ;
48
48
lines
49
- . map ( line => line . replace ( / ^ \u0001 .+ ?\d / , '' ) . replace ( / \n + $ / , '' ) )
49
+ . map ( line => line . replace ( / ^ \u0001 .+ ?( \d ) / g , '$1 ' ) . replace ( / \n + $ / , '' ) )
50
50
. filter ( line => line && line . length > 0 )
51
51
. map ( line => {
52
+ if ( line . startsWith ( 'Logs for' ) ) {
53
+ return { date : null , msg : `${ chalk . bold ( line ) } \n` } ;
54
+ }
55
+
52
56
const parts = line . split ( / \d Z \s / ) ;
53
57
const date = new Date ( parts [ 0 ] ) ;
54
58
const msg = parts [ 1 ] ;
55
59
return { date, msg} ;
56
60
} )
57
61
. filter ( ( { date, msg} ) => date !== undefined && msg !== undefined )
58
62
. map ( ( { date, msg} ) => ( {
59
- date : isFinite ( date ) ? `${ date . toLocaleDateString ( ) } ${ date . toLocaleTimeString ( ) } ` : ' ' ,
63
+ date : date && isFinite ( date ) ? `${ date . toLocaleDateString ( ) } ${ date . toLocaleTimeString ( ) } ` : ' ' ,
60
64
msg,
61
65
} ) )
62
66
. map ( ( { date, msg} ) => `${ chalk . gray ( `${ date } ` ) } ${ msg } ` )
Original file line number Diff line number Diff line change @@ -13,9 +13,9 @@ module.exports = () => {
13
13
const date2 = '2017-05-18T15:16:40.212591019Z' ;
14
14
const date3 = '2017-05-18T15:16:40.375554362Z' ;
15
15
const dirtyLogs = [
16
- `\u0001\u0000\u0000\u0000\u0000\u0000\u00002 ${ date1 } yarn start v0.24.4` ,
17
- `\u0001\u0000\u0000\u0000\u0000\u0000\u00000 ${ date2 } $ node index.js ` ,
18
- `\u0001\u0000\u0000\u0000\u0000\u0000\u00004 ${ date3 } Listening on port 80` ,
16
+ `\u0001\u0000\u0000\u0000\u0000\u0000\u0000g ${ date1 } yarn start v0.24.4` ,
17
+ `\u0001\u0000\u0000\u0000\u0000\u0000\u0000 ${ date2 } $ node index.js ` ,
18
+ `\u0001\u0000\u0000\u0000\u0000\u0000\u0000 ${ date3 } Listening on port 80` ,
19
19
'' ,
20
20
] ;
21
21
@@ -46,7 +46,7 @@ module.exports = () => {
46
46
t . deepEqual (
47
47
consoleSpy . args ,
48
48
[
49
- [ 'Getting logs for deployment:' , id ] ,
49
+ [ 'Getting logs for deployment:' , id , '\n' ] ,
50
50
[ `${ d1 . toLocaleDateString ( ) } ${ d1 . toLocaleTimeString ( ) } yarn start v0.24.4` ] ,
51
51
[ `${ d2 . toLocaleDateString ( ) } ${ d2 . toLocaleTimeString ( ) } $ node index.js ` ] ,
52
52
[ `${ d3 . toLocaleDateString ( ) } ${ d3 . toLocaleTimeString ( ) } Listening on port 80` ] ,
You can’t perform that action at this time.
0 commit comments