Fixed bug which caused --logfile and --loglevel command line paramete…

…rs to not be respected when running locust without zeromq. This fixes #25.
locustio · Jul 1, 2012 · ee71631 · ee71631
1 parent b6b35e1
commit ee71631
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,12 @@
 Changelog
 ==========
 
+0.5.1
+=====
+
+* Fixed bug which caused --logfile and --loglevel command line parameters to not be respected when running 
+  locust without zeromq.
+
 0.5
 ===
 

diff --git a/locust/rpc/socketrpc.py b/locust/rpc/socketrpc.py
@@ -5,7 +5,7 @@
 import logging
 from locust.exception import LocustError
 
-logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
 
 def _recv_bytes(sock, bytes):
     data = ""
@@ -97,7 +97,7 @@ def handle_slave(sock):
                 while True:
                     self.event_queue.put_nowait(_recv_obj(sock))
             except Exception, e:
-                logging.info("Slave disconnected")
+                logger.info("Slave disconnected")
                 slaves.remove(sock)
                 if self.slave_index == len(slaves) and len(slaves) > 0:
                     self.slave_index -= 1
@@ -110,7 +110,7 @@ def handle_slave(sock):
         def listener():
             while True:
                 _socket, _addr = sock.accept()
-                logging.info("Slave connected")
+                logger.info("Slave connected")
                 slaves.append(_socket)
                 gevent.spawn(lambda: handle_slave(_socket))