postrebase fix + better logging

qoollo · Jan 21, 2024 · adcff00 · adcff00
1 parent 45824fa
commit adcff00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/backend/src/services/api.rs b/backend/src/services/api.rs
@@ -16,6 +16,7 @@ use super::prelude::*;
         ),
         security(("api_key" = []))
 ))]
+#[tracing::instrument(ret, skip(client), level = "info", fields(method = "GET"))]
 pub async fn get_disks_count(Extension(client): Extension<HttpBobClient>) -> Json<DiskCount> {
     tracing::info!("get /disks/count : {:?}", client);
 
@@ -83,6 +84,7 @@ pub async fn get_disks_count(Extension(client): Extension<HttpBobClient>) -> Jso
         ),
         security(("api_key" = []))
 ))]
+#[tracing::instrument(ret, skip(client), level = "info", fields(method = "GET"))]
 pub async fn get_nodes_count(Extension(client): Extension<HttpBobClient>) -> Json<NodeCount> {
     tracing::info!("get /nodes/count : {:?}", client);
 
@@ -130,6 +132,7 @@ pub async fn get_nodes_count(Extension(client): Extension<HttpBobClient>) -> Jso
         ),
         security(("api_key" = []))
 ))]
+#[tracing::instrument(ret, skip(client), level = "info", fields(method = "GET"))]
 pub async fn get_rps(Extension(client): Extension<HttpBobClient>) -> Json<RPS> {
     tracing::info!("get /nodes/rps : {:?}", client);
 
@@ -168,6 +171,7 @@ pub async fn get_rps(Extension(client): Extension<HttpBobClient>) -> Json<RPS> {
         ),
         security(("api_key" = []))
 ))]
+#[tracing::instrument(ret, skip(client), level = "info", fields(method = "GET"))]
 pub async fn get_space(Extension(client): Extension<HttpBobClient>) -> Json<SpaceInfo> {
     tracing::info!("get /space : {:?}", client);
     let mut spaces: FuturesUnordered<_> = client

diff --git a/backend/src/services/auth.rs b/backend/src/services/auth.rs
@@ -68,7 +68,7 @@ pub async fn login(
     Extension(request_timeout): Extension<RequestTimeout>,
     Json(bob): Json<BobConnectionData>,
 ) -> AxumResult<StatusCode> {
-    let bob_client = BobClient::<HttpClient>::try_new(bob.clone(), request_timeout)
+    let bob_client = BobClient::<_, HttpClient>::try_new(bob.clone(), request_timeout)
         .await
         .map_err(|err| {
             tracing::error!("{err:?}");
@@ -109,7 +109,13 @@ pub async fn login(
             tracing::error!("{err:?}");
             StatusCode::UNAUTHORIZED
         })?;
-        auth.client_store.insert(*bob_client.id(), bob_client);
+        auth.client_store
+            .save(*bob_client.id(), bob_client)
+            .await
+            .map_err(|err| {
+                tracing::error!("{err:?}");
+                StatusCode::INTERNAL_SERVER_ERROR
+            })?;
     }
 
     Ok(res)