]> gitweb.maison.local Git - rome.git/commitdiff
HB : moved debug messages to logger.debug
authorlionel <lionel@isis.maison.local>
Wed, 14 Sep 2016 11:33:08 +0000 (13:33 +0200)
committerlionel <lionel@isis.maison.local>
Wed, 14 Sep 2016 11:33:08 +0000 (13:33 +0200)
remus
romulus

diff --git a/remus b/remus
index d21d728a3f94768e00552b01b2c4020c821736e6..98d9f847fcc6bb8dbd268df87b3a0d8a60b1562a 100755 (executable)
--- a/remus
+++ b/remus
@@ -51,19 +51,19 @@ class App():
 
       while True:
         time.sleep(30)
-        logger.info("HB : challenge starting")
+        logger.debug("HB : challenge starting")
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.connect((DEST_TCP_IP, DEST_TCP_PORT))
         s.send(MESSAGE)
-        logger.info("HB : waiting for the reply packet ...")
+        logger.debug("HB : waiting for the reply packet ...")
         data = s.recv(MY_BUFFER_SIZE)
         #data = s.recv(BUFFER_SIZE).decode('UTF-8')
-        logger.info("HB : reply packet received")
+        logger.debug("HB : reply packet received")
         s.close()
         try:
-          logger.info("HB : trying to decrypt data : " + str(data))
+          logger.debug("HB : trying to decrypt data : " + str(data))
           data = k.decrypt(data).decode('UTF-8')
-          logger.info("HB : received data:" + str(data))
+          logger.debug("HB : received data:" + str(data))
           #data = k.decrypt(data)
           #data = data.decode('UTF-8')
           if data == "Received":
@@ -71,7 +71,7 @@ class App():
           else:
             logger.warn("HB : Error")
         except:
-            logger.info("Received an invalid HB packet")
+            logger.warn("Received an invalid HB packet")
             time.sleep(1)
 
       logger.error("I am out of the infinit HB loop !")
diff --git a/romulus b/romulus
index 37f1caec913d5f3eb73c22e35a2ecc9dc69c44a5..bc99f9ea369ab3f348d104dcba6f45d3cb03ed83 100755 (executable)
--- a/romulus
+++ b/romulus
@@ -54,7 +54,7 @@ class App():
         if not conn: break
         data = conn.recv(MY_BUFFER_SIZE)
         if not data: break
-        logger.info("HB : Received HB from " + str(addr) + " : " + str(data))
+        logger.debug("HB : Received HB from " + str(addr) + " : " + str(data))
         k = pyDes.des(b"DEADJACK", pyDes.CBC, b"\2\2\2\2\2\2\2\2", pad=None, padmode=2)
         try:
             logger.debug("HB : HB packet content is : " + str(data))
@@ -65,15 +65,14 @@ class App():
             logger.debug("HB : decode from UTF-8")
             logger.debug("HB : HB packet content is : " + str(data))
             if data == "HB":
-              logger.info("HB : sending HB packet back")
+              logger.info("HB : Remus pinged")
               DEST_MESSAGE = bytes("Received", 'UTF-8')
               DEST_MESSAGE = k.encrypt(DEST_MESSAGE)
               # Sending
               conn.send(DEST_MESSAGE)
               conn.close()
         except:
-            logger.warn("HB : Received an invalid HB packet")
-            time.sleep(1)
+            logger.warn("HB : Received an invalid HB packet" + str(addr) + " : " + str(data))
       logger.error("HB : I am out of the infinit HB loop !")
       return 1