summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-23 11:08:53 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-23 11:08:53 -0300
commit52b7c2f2186066956b795053eba0e53399876a28 (patch)
treebc2c0a34ea205b92083e9b93b5a12201affa1569
parentb16437ac68a72b128e3771e0847f376237f649a3 (diff)
parentb45d207241dc22eda1129bc37d7a0948235b20fb (diff)
Merge remote-tracking branch 'kali/bug/more-compact-debug' into develop
-rw-r--r--src/leap/common/events/component.py6
-rw-r--r--src/leap/common/events/server.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/common/events/component.py b/src/leap/common/events/component.py
index 98a97bc..f62f948 100644
--- a/src/leap/common/events/component.py
+++ b/src/leap/common/events/component.py
@@ -137,7 +137,7 @@ def register(signal, callback, uid=None, replace=False, reqcbk=None,
logger.info(
"Sending registration request to server on port %s: %s",
server.SERVER_PORT,
- str(request))
+ str(request)[:40])
return service.register(request, callback=reqcbk, timeout=timeout)
@@ -178,7 +178,7 @@ def signal(signal, content="", mac_method="", mac="", reqcbk=None,
request.mac = mac
service = RpcService(proto.EventsServerService_Stub, server.SERVER_PORT,
'localhost')
- logger.info("Sending signal to server: %s", str(request))
+ logger.info("Sending signal to server: %s", str(request)[:40])
return service.signal(request, callback=reqcbk, timeout=timeout)
@@ -204,7 +204,7 @@ class EventsComponentService(proto.EventsComponentService):
@param done: callback to be called when done
@type done: protobuf.socketrpc.server.Callback
"""
- logger.info('Received signal from server: %s' % str(request))
+ logger.info('Received signal from server: %s...' % str(request)[:40])
# run registered callbacks
# TODO: verify authentication using mac in incoming message
diff --git a/src/leap/common/events/server.py b/src/leap/common/events/server.py
index 16c6513..34c573a 100644
--- a/src/leap/common/events/server.py
+++ b/src/leap/common/events/server.py
@@ -88,7 +88,7 @@ class EventsServerService(proto.EventsServerService):
@param done: callback to be called when done
@type done: protobuf.socketrpc.server.Callback
"""
- logger.info("Received registration request: %s" % str(request))
+ logger.info("Received registration request: %s..." % str(request)[:40])
# add component port to signal list
if request.event not in registered_components:
registered_components[request.event] = set([])
@@ -112,7 +112,7 @@ class EventsServerService(proto.EventsServerService):
@param done: callback to be called when done
@type done: protobuf.socketrpc.server.Callback
"""
- logger.info('Received signal from component: %s', str(request))
+ logger.info('Received signal from component: %s...', str(request)[:40])
# send signal to all registered components
# TODO: verify signal auth
if request.event in registered_components: