From 87ea9aa6688a457acd912c3e2213003583535f3a Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Fri, 10 May 2024 13:08:51 +0200 Subject: [PATCH] Improve logging a bit --- Cargo.lock | Bin 70393 -> 70393 bytes Cargo.toml | 2 +- core.pkl | 6 +++++- src/handlers/v1/ws/controllers/mod.rs | 3 +++ src/handlers/v1/ws/relays/mod.rs | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0f8c11992d6f091fd81dec4c9a062f01f488492f..9ca1b7e64c13bdd8c548a552938fbf8dd7b41efe 100644 GIT binary patch delta 1600 zcmXX`JBXcC5auqc**x7CayRZS*+mQE3uexoXW`x?qDBk7k`xL`ICCCa2^(9REo_8< zdXS)C5g`dah--c^U1Sjpiv$BkY$VY_jIS6qMGC>WchjB!Kb)EG`{w)R=84IhCni@P zn(AR&*}m94HFaRq__)wMzw^rYG}oQkabo>`u6t#EdP~o>wIjo&5TYUDve!u`i-pP5 zFQJl~i>$AQt1aOC{?9q)N^{2X5Cl^}9XyJv-Z0PW9W-{nOpaN8X=k?eK75 zNGFr3#h`PIOqoe(<*Z3S%taZOYEV@vCSNTlNXBOq5Pb9sxcxZYZ+E=5q5Jo-pSO+~ z%r-bU)%|y9^JIJZkKrI`V_ou@5n>rV3rVs{T|t-gNnwspYW?l*p)YS#zDfsdK84v~Yw2v|ABT1Zz_lGCVE(5e>nk!tX$ z6DjK}GCKuYA<0m$_1j-BO|=g%EOg(!^X--%b|0O*f1<6uFdR4xQkIH>V1#HX)@63& znOKHcBZ(eC2Y_5jIi?D(7F(RmWz@7?r(NBvAIwg)<JtA&v&=w)wy=+^bV18dE)7T^H4DrE*Y&5)y`1FNFrNuDig4D zOQ3ZXM^s_W%31?*D?TJk?f9X7JN(I`qv1Rtvo0D;7{3Zu>H=^n-a`he0vMPzhlm*E z%USPDt-^p5HITG#)T5VQ;HJ09I`|aV+cx;8Ng_8 z$e}Q2FQSlGFz6I&VGw~rO>OU2Gws+nkB>?XiqZ~1i+;8wiU}p_UNjW67I9Q97s-%p znS!cvsgf{B%g7brjT&u`_QmCUgzcN(&vjp3T-dgLY?ptyy_>x9;Kp|3m*L)IVr7gL z#O6-&WT)g95q0WC=u>PGHxu5KF_t`xFx zBM8xp2D3{b5eH%?Pt3*v5f?5T0xE7KQACJ}ampeK!BdsEdsUBn-hco9`_I*r(^pSU zuiiD&Q|<7ko!vt-2X34^F0}V7x%Agmv_u|A3t_Lwezn&vcy(9h@wXsS2$9QMA}swbkshDno(I-YEr6NQL3~R zE2^{A5Eqwsx8>P>xB9}tHP;k(JC6J|)6;F`!O>#TKt8D~lTn8%(kR;$5FmMWR$21V zVllRsSUDRkNC-^KS^R51%=OzJPtCM9zgXzLeeLV@J=MK+>W-;)^{3HtL4zq#iR?X_ zU^J2SatjC9fX^nRT5LrU3o>W}U_to`l{|%MXEQqbg;7ZOY@Zmc}2%sNHAyREDay2ZCY=(RtG5|t@p5hF2z zskT%~B^zNPnE)=TU_gvuS4B(8&J}W?tuG2JTFR|=X-hkCdP`e*Kx`}-h0IK@pw9x2 zj?UnF&3%><$n9RhDD2?{_+ zE<>sogJNr3#2P_q$3973=p$$$p`=osXPN3kLcA_>YdiAYeD}%ug^lBfcH#TA-Sovf zXU7c^$xMPtaiAS?{rNXtOaD*eZDP!+Ha%hX4~Gu;M|AndQ-i2xIY@I;5kPt`NSH=TTnPw#*-=% zg=|ZZwMN<$qnwpav6JcwI+$!?x$byt9pw$Z`^UqU1jK~dcq>3+2~t9tszU(Fn4Ak9 jl`$Y2*s5BM*aOiA3_y{i6zhLDwq7&j+{+t#Pfq^_>Id$` diff --git a/Cargo.toml b/Cargo.toml index 63c40fa..15d69db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "emgauwa-core" -version = "0.5.0" +version = "0.5.1" edition = "2021" authors = ["Tobias Reisinger "] diff --git a/core.pkl b/core.pkl index 92c294a..628b69f 100644 --- a/core.pkl +++ b/core.pkl @@ -1 +1,5 @@ -amends "package://emgauwa.app/pkl/emgauwa@0.1.0#/core.pkl" +amends "package://emgauwa.app/pkl/emgauwa@0.1.1#/core.pkl" + +logging { + level = "DEBUG" +} diff --git a/src/handlers/v1/ws/controllers/mod.rs b/src/handlers/v1/ws/controllers/mod.rs index 2b39e5a..9e5c63f 100644 --- a/src/handlers/v1/ws/controllers/mod.rs +++ b/src/handlers/v1/ws/controllers/mod.rs @@ -78,6 +78,7 @@ impl ControllersWs { return; } + log::trace!("Sending ping to controller"); ctx.ping(&[]); }); } @@ -122,10 +123,12 @@ impl StreamHandler> for ControllersWs { match msg { Message::Ping(msg) => { + log::trace!("Received ping from controller: {:?}", msg); self.hb = Instant::now(); ctx.pong(&msg) } Message::Pong(_) => { + log::trace!("Received pong from controller"); self.hb = Instant::now(); } Message::Text(text) => match serde_json::from_str(&text) { diff --git a/src/handlers/v1/ws/relays/mod.rs b/src/handlers/v1/ws/relays/mod.rs index f4dd9e2..106053d 100644 --- a/src/handlers/v1/ws/relays/mod.rs +++ b/src/handlers/v1/ws/relays/mod.rs @@ -77,10 +77,12 @@ impl StreamHandler> for RelaysWs { match msg { ws::Message::Ping(msg) => { + log::trace!("Received ping from relay-client: {:?}", msg); self.hb = Instant::now(); ctx.pong(&msg) } ws::Message::Pong(_) => { + log::trace!("Received pong from relay-client"); self.hb = Instant::now(); } ws::Message::Text(_) => log::debug!("Received unexpected text in relays ws"),