summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-06-11 11:54:10 -0300
committerdrebs <drebs@leap.se>2015-06-11 12:07:49 -0300
commitb33f0ef3485311f87990409ef8ba2bcb8b26dc5d (patch)
tree7e5fedd5864cfc4d57326997bd0bfe2058f56135
parentb67648aa666345b0800b48f6c203538b21c9a201 (diff)
[bug] remove extraneous data from events logs
The emission of an event was being logged twice, and the second time was logging the pickled content of the event. This pickled content contained line breaks and other things that caused strange output on the client log. This commit removes the second loggin of the event pickled content. Closes #7130.
-rw-r--r--changes/bug_7130_remove-extraneous-data-from-events-logs1
-rw-r--r--src/leap/common/events/client.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug_7130_remove-extraneous-data-from-events-logs b/changes/bug_7130_remove-extraneous-data-from-events-logs
new file mode 100644
index 0000000..6a12ee5
--- /dev/null
+++ b/changes/bug_7130_remove-extraneous-data-from-events-logs
@@ -0,0 +1 @@
+ o Remove extraneous data from events logs. Closes #7130.
diff --git a/src/leap/common/events/client.py b/src/leap/common/events/client.py
index 0706fe3..4852b5a 100644
--- a/src/leap/common/events/client.py
+++ b/src/leap/common/events/client.py
@@ -173,7 +173,7 @@ class EventsClient(object):
:param content: The content of the event.
:type content: list
"""
- logger.debug("Sending event: (%s, %s)" % (event, content))
+ logger.debug("Emitting event: (%s, %s)" % (event, content))
self._send(str(event) + b'\0' + pickle.dumps(content))
def _handle_event(self, event, content):
@@ -368,7 +368,6 @@ class EventsClientThread(threading.Thread, EventsClient):
:param data: The data to be sent.
:type event: str
"""
- logger.debug("Sending data: %s" % data)
# add send() as a callback for ioloop so it works between threads
self._loop.add_callback(lambda: self._push.send(data))