From 5631a3b301319fd6623fce5ada99f2995217c723 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sun, 24 Sep 2023 14:57:44 +0100 Subject: [PATCH] Include log chunk when task runner sees log update, clarify if we can pull logs from same line or next line --- dist/index.js | Bin 19481783 -> 19481965 bytes dist/index.js.map | Bin 13785225 -> 13785425 bytes .../providers/k8s/kubernetes-task-runner.ts | 5 ++++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 7d0347b654609ab871947cf62878f256b9f4c7ea..6cafe5251cd4d02177edd12f26dcd07fd612b3e3 100644 GIT binary patch delta 1394 zcmYM!Ranzu6oBz(2*^+r6(p=bIS>W0yA>N08-u|nPIOGbP80(R5pZ^6D~N%O-CfvX zw_heNsFq%!-YUk7fFU!<|Bx{=?Mw2!&TCX!N|LyGH?;mFxXo&X- z|F9}^lMYcNLnXtZ&W27@`_Yl?%}K1*$5Hsz^2%=u{+f&Ui< zW>~qJ6*qfjN=Ui|3c(Uquts6nKn+_IK~dPD7>dIlB~TKj-~dOIh7+9O0#}qlS(HP0 zRDj%egF8In2`_j<10VRJBK%MZmEn&7R6!uBq8h5B25O=fYNHP7q8{p_0UDwa8lwrC zq8XZ_1zI8qt)0uo`Qy7VEGc8?X_Z zuo;=i!WLv>E4E=fb|42ku?xGg2Yay(`;m(SIEX_yj3YRTV>pfzIEhm@jWallb2yI+ zxQI)*j4QZ`YskZO+`vuT!fo8aUED)H?&AR-;t?L>37+B^p5p~x;uT)w4c?*v@9-WU z@DZQz8DH=f-|!tj@DsoA8-J#Uq^pu4v5*v!SW2uU){?>!8;M$CD=8u=DzTFklN6WO zOG-#eN=iu_B#x5O5+{kX#6{vNDI+N>DJLl}sUT4#ZW4Eihs0CjCGnPMRJnW;s;JDr DXhLQr delta 1272 zcmWmEXPgfN9LMq3{W+ZD&bl+tUR^^=iioIG5+Vvw8nP=iG|a3@iTk5c;V48#DH4kI zuoabEQAEQi;r)B?{yh9X{2m&YpSEmle%jEHDN7S8CnX0=PP9+$(Q{D0-pQlML{{Fw zhS|y0>FJrt{xfnik{O+|vq$IVB`82aQYl1XijYQ8(kVu9GRUL^B`HN|%8*5DmZco! zsX#?4kwaywP?c&_rv^2tMQ!R(mvhMFT+ZWsE}$M4auFAE371lz%V@ymTtPz`aV3pu z!c{b-8CTPs7F@%%Tt`c;=LT-16*tkEn`uK^+Hni*>AuyzIzHi3KI3z~;7h*ZYrf%I z*0X_)Y+^H8*vdA(<9oKVgCF>jpV-MRcC&}Q>|;Ma^9#RnfP?(T?;PSVe{h7O{K;SZ z%|9IDI43yCzx>B3{^vAj#^>gxOdyho6o?dzq(%xw3P*}W(jrA8>5*cQ;*pFxP-=AumQg2nAQ`a<tgth1Db=l4(M zN34p?jg-Rr$HF2+@Ub_3BECJ)SM-)hu5||eQrG`$LKUL(7xihO8c|-Y^A(wfAZ=Y( zqK{~PtqZ7ZHRv${K^O@M!3e=9j7BKNAPnJ%z*vk!B*r5O(TG7TCSW4s5RU{*LLw%^ zfGL=YBqU=Rreg+DFcY&d8*`9~xky7g=3zb-U?DP)iA7k9EG)rNEW>iFKsHul6>^Y^ zJgi1Oj97yLm>|Q9LKMM*wXk9xY_OvkC0Gv!N>K(UHee$*VKcU1E4E=fc3>yUu?xFV zfj!uZeW=8KRN(*);t&p_8b@#x$8a1qsKp7?LEt1#;WWTKMl;@^1#j^V@9_bx_=q-q VLOVL}8DG$eE_5rchOaFn{s9MP2SNY< delta 955 zcmW;C)pyPT0LJn28q-W~renI>m>youbWQhkcTR3%{B(DY;niK!`~_~D&b zpL4$FJkOUKxzSs$=SF8|h4)m6Efh+NG+9(EDfF*%l7=OOf;GQm3P*mHiFp~yNgdVg z{}2@T9yKeHIz4nG>fdjDI3+!t5+V;#~>h7{eLCNJcT5F^naZag1jI6Pd(h zrZAOhOlJl&nME42nZsP>F`or2WD$#5!cvy8oE5BO6{}gpTGp|i4Qyl+>1<{TTiM2T zc920PJK4o<_K?M1_7Sk3103WKhdIJgj&Yn5oa7XzIm21bah?lY?|9D#KJtmre2HWxetlN)FFNUx ATL1t6 diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts index f4a6bbfc..3362afbf 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts @@ -48,7 +48,10 @@ class KubernetesTaskRunner { } if (chunk.includes(`LOGS:`)) { const result = RemoteClientLogger.HandleLogChunkLine(chunk); - CloudRunnerLogger.log(`Logs found HandleLogChunkLineResult:${result}\n${chunk}`); + + // remove "LOGS: " and decode base64 remaining + const unpacked = Buffer.from(chunk.split(`LOGS: `)[1], 'base64').toString('ascii'); + CloudRunnerLogger.log(`Logs found HandleLogChunkLineResult:${result}\n${unpacked}`); } } };