-adjust logging

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

2 files changed, 22 insertions, 9 deletions

diff --git a/src/service/messenger/gnunet-service-messenger.c b/src/service/messenger/gnunet-service-messenger.c
index 2cbc8933d..3f88aff4b 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -28,6 +28,7 @@
 #include "gnunet-service-messenger_handle.h"
 #include "gnunet-service-messenger_room.h"
 #include "gnunet-service-messenger_service.h"
+#include "gnunet_common.h"
 #include "messenger_api_message.h"
 
 struct GNUNET_MESSENGER_Client
@@ -408,18 +409,19 @@ handle_get_message (void *cls,
 
   struct GNUNET_MESSENGER_MemberStore *member_store =
     get_srv_room_member_store (room);
+  
+  const struct GNUNET_ShortHashCode *member_id;
+  member_id = get_srv_handle_member_id (msg_client->handle,
+                                        &(msg->key));
 
   struct GNUNET_MESSENGER_Member *member = get_store_member (member_store,
-                                                             get_srv_handle_member_id (
-                                                               msg_client->
-                                                               handle,
-                                                               &(msg->key)
-                                                               ));
+                                                             member_id);
 
   if (! member)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Member not valid to request a message!\n");
+                "Member not valid to request a message! (%s)\n",
+                GNUNET_sh2s (member_id));
     goto end_handling;
   }
 
@@ -429,7 +431,8 @@ handle_get_message (void *cls,
   if (! pubkey)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Handle needs to have a public key to request a message!\n");
+                "Handle needs to have a public key to request a message! (%s)\n",
+                GNUNET_sh2s (member_id));
     goto end_handling;
   }
 
@@ -439,7 +442,8 @@ handle_get_message (void *cls,
   if (! session)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Session not valid to request a message!\n");
+                "Session not valid to request a message! (%s)\n",
+                GNUNET_sh2s (member_id));
     goto end_handling;
   }
 
diff --git a/src/service/messenger/gnunet-service-messenger_operation_store.c b/src/service/messenger/gnunet-service-messenger_operation_store.c
index ab6576a45..de7590edd 100644
--- a/src/service/messenger/gnunet-service-messenger_operation_store.c
+++ b/src/service/messenger/gnunet-service-messenger_operation_store.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021, 2023 GNUnet e.V.
+   Copyright (C) 2021--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -58,6 +58,9 @@ clear_operation_store (struct GNUNET_MESSENGER_OperationStore *store)
 {
   GNUNET_assert (store);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Clear operation store of room: %s\n",
+             GNUNET_h2s (get_srv_room_key (store->room)));
+
   GNUNET_CONTAINER_multihashmap_iterate (store->operations,
                                          iterate_destroy_operations, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (store->operations);
@@ -100,6 +103,9 @@ load_operation_store (struct GNUNET_MESSENGER_OperationStore *store,
   char *load_dir;
   GNUNET_asprintf (&load_dir, "%s%s%c", directory, "operations", DIR_SEPARATOR);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Load operation store from directory: %s\n",
+             load_dir);
+
   if (GNUNET_OK == GNUNET_DISK_directory_test (load_dir, GNUNET_YES))
     GNUNET_DISK_directory_scan (load_dir, callback_scan_for_operations, store);
 
@@ -137,6 +143,9 @@ save_operation_store (const struct GNUNET_MESSENGER_OperationStore *store,
   char *save_dir;
   GNUNET_asprintf (&save_dir, "%s%s%c", directory, "operations", DIR_SEPARATOR);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Save operation store to directory: %s\n",
+             save_dir);
+
   if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
       (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
     GNUNET_CONTAINER_multihashmap_iterate (store->operations,