Parcourir la source

[1429] Logging

Michal 'vorner' Vaner il y a 13 ans
Parent
commit
b7bbe25fdf
2 fichiers modifiés avec 13 ajouts et 2 suppressions
  1. 11 0
      src/bin/bind10/bind10_messages.mes
  2. 2 2
      src/bin/bind10/bind10_src.py.in

+ 11 - 0
src/bin/bind10/bind10_messages.mes

@@ -99,6 +99,12 @@ The boss module is sending a kill signal to process with the given name,
 as part of the process of killing all started processes during a failed
 startup, as described for BIND10_KILLING_ALL_PROCESSES
 
+% BIND10_LOST_SOCKET_CONSUMER consumer of sockets disconnected, considering all its sockets closed
+A connection from one of the applications which requested a socket was
+closed. This means the application has terminated, so all the sockets it was
+using are now closed and bind10 process can release them as well, unless the
+same sockets are used by yet another application.
+
 % BIND10_MSGQ_ALREADY_RUNNING msgq daemon already running, cannot start
 There already appears to be a message bus daemon running. Either an
 old process was not shut down correctly, and needs to be killed, or
@@ -110,6 +116,11 @@ While listening on the message bus channel for messages, it suddenly
 disappeared. The msgq daemon may have died. This might lead to an
 inconsistent state of the system, and BIND 10 will now shut down.
 
+% BIND10_NO_SOCKET couldn't send a socket for token %1 because of error: %2
+An error occurred when the bind10 process was asked to send a socket file
+descriptor. The error is mentioned, most common reason is that the request
+is invalid and may not come from bind10 process at all.
+
 % BIND10_PROCESS_ENDED process %2 of %1 ended with status %3
 This indicates a process started previously terminated. The process id
 and component owning the process are indicated, as well as the exit code.

+ 2 - 2
src/bin/bind10/bind10_src.py.in

@@ -872,7 +872,7 @@ class BoB:
             unix_socket.sendall("1\n")
             libutil_io_python.send_fd(unix_socket.fileno(), fd)
         except Exception as e:
-            # TODO Log
+            logger.error(BIND10_NO_SOCKET, token, e)
             unix_socket.sendall("0\n")
 
     def socket_consumer_dead(self, unix_socket):
@@ -881,7 +881,7 @@ class BoB:
         sockets sent to it are to be considered closed. This function signals
         so to the _socket_cache.
         """
-        # TODO Log
+        logger.error(BIND10_LOST_SOCKET_CONSUMER, unix_socket.fileno())
         self._socket_cache.drop_application(unix_socket.fileno())
 
     def insert_creator(self, creator):