Parcourir la source

[1180] address review comments

Jelte Jansen il y a 13 ans
Parent
commit
ad134a3c51
1 fichiers modifiés avec 2 ajouts et 5 suppressions
  1. 2 5
      src/bin/msgq/msgq.py.in

+ 2 - 5
src/bin/msgq/msgq.py.in

@@ -28,7 +28,6 @@ import struct
 import errno
 import errno
 import time
 import time
 import select
 import select
-import pprint
 import random
 import random
 from optparse import OptionParser, OptionValueError
 from optparse import OptionParser, OptionValueError
 import isc.util.process
 import isc.util.process
@@ -293,9 +292,6 @@ class MsgQ:
             sys.stderr.write("[b10-msgq] Routing decode error: %s\n" % err)
             sys.stderr.write("[b10-msgq] Routing decode error: %s\n" % err)
             return
             return
 
 
-#        sys.stdout.write("\t" + pprint.pformat(routingmsg) + "\n")
-#        sys.stdout.write("\t" + pprint.pformat(data) + "\n")
-
         self.process_command(fd, sock, routingmsg, data)
         self.process_command(fd, sock, routingmsg, data)
 
 
     def process_command(self, fd, sock, routing, data):
     def process_command(self, fd, sock, routing, data):
@@ -363,7 +359,8 @@ class MsgQ:
                 # in the case the other side seems gone, kill the socket
                 # in the case the other side seems gone, kill the socket
                 # and drop the send action
                 # and drop the send action
                 if sockerr.errno == errno.EPIPE:
                 if sockerr.errno == errno.EPIPE:
-                    print("[b10-msgq] SIGPIPE on send, dropping message")
+                    print("[b10-msgq] SIGPIPE on send, dropping message " +
+                          "and closing connection")
                     self.kill_socket(fileno, sock)
                     self.kill_socket(fileno, sock)
                     return
                     return
                 else:
                 else: