[gnunet] 01/08: MESSENGER: Adjust logging

[gnunet]

This is an automated email from the git hooks/post-receive script.

thejackimonster pushed a commit to branch master
in repository gnunet.

commit 7a8e2c4c7de4d14d4eebad4f4adb4846d9d746a2
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Sun Jan 21 08:56:33 2024 +0100

    MESSENGER: Adjust logging
    
    Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 src/service/messenger/gnunet-service-messenger_handle.c       |  5 +++--
 src/service/messenger/gnunet-service-messenger_message_send.c | 10 +++++++++-
 src/service/messenger/gnunet-service-messenger_room.c         |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/service/messenger/gnunet-service-messenger_handle.c 
b/src/service/messenger/gnunet-service-messenger_handle.c
index 55548c0fb..225a62af9 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "gnunet_messenger_service.h"
 #include "platform.h"
 #include "gnunet-service-messenger_handle.h"
 
@@ -453,8 +454,8 @@ notify_srv_handle_message (struct 
GNUNET_MESSENGER_SrvHandle *handle,
     context = get_next_member_session_context (session->member);
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Notifying client about message: %s\n",
-              GNUNET_h2s (hash));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Notifying client about message: %s 
(%s)\n",
+              GNUNET_h2s (hash), GNUNET_MESSENGER_name_of_kind 
(message->header.kind));
 
   struct GNUNET_MESSENGER_RecvMessage *msg;
   struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.c 
b/src/service/messenger/gnunet-service-messenger_message_send.c
index ddabf0b32..6b3b3eb65 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.c
+++ b/src/service/messenger/gnunet-service-messenger_message_send.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020--2023 GNUnet e.V.
+   Copyright (C) 2020--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
@@ -62,7 +62,11 @@ notify_about_members (struct GNUNET_MESSENGER_MemberNotify 
*notify,
         (GNUNET_YES != check_member_session_history (notify->session,
                                                      &(element->hash),
                                                      GNUNET_NO)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+                  "Permission for notification of session message denied!\n");
       continue;
+    }
 
     if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (map, &(element->hash),
                                                         NULL,
@@ -74,7 +78,11 @@ notify_about_members (struct GNUNET_MESSENGER_MemberNotify 
*notify,
       message_store, &(element->hash));
 
     if ((! message) || (GNUNET_YES == is_peer_message (message)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+                  "Session message for notification is invalid!\n");
       continue;
+    }
 
     struct GNUNET_MESSENGER_SenderSession sender;
     sender.member = session;
diff --git a/src/service/messenger/gnunet-service-messenger_room.c 
b/src/service/messenger/gnunet-service-messenger_room.c
index 1b8ce37ce..a940af64c 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -568,7 +568,10 @@ send_srv_room_message (struct GNUNET_MESSENGER_SrvRoom 
*room,
   new_message = update_room_message (room, message, &hash);
 
   if (GNUNET_YES != new_message)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Sending duplicate message 
failed!\n");
     return GNUNET_SYSERR;
+  }
 
   switch (message->header.kind)
   {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.