Merge remote-tracking branch 'kali/bug/allow-absolute-paths2' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 28 May 2013 20:38:30 +0000 (17:38 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 28 May 2013 20:38:30 +0000 (17:38 -0300)
1  2 
src/leap/common/crypto.py
src/leap/common/events/component.py
src/leap/common/events/server.py

Simple merge
@@@ -197,14 -197,14 +197,14 @@@ class EventsComponentService(proto.Even
          This method is called whenever a signal request is received from
          server.
  
-         @param controller: used to mediate a single method call
-         @type controller: protobuf.socketrpc.controller.SocketRpcController
-         @param request: the request received from the component
-         @type request: leap.common.events.events_pb2.SignalRequest
-         @param done: callback to be called when done
-         @type done: protobuf.socketrpc.server.Callback
+         :param controller: used to mediate a single method call
+         :type controller: protobuf.socketrpc.controller.SocketRpcController
+         :param request: the request received from the component
+         :type request: leap.common.events.events_pb2.SignalRequest
+         :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
@@@ -81,14 -81,14 +81,14 @@@ class EventsServerService(proto.EventsS
          """
          Register a component port to be signaled when specific events come in.
  
-         @param controller: used to mediate a single method call
-         @type controller: protobuf.socketrpc.controller.SocketRpcController
-         @param request: the request received from the component
-         @type request: leap.common.events.events_pb2.RegisterRequest
-         @param done: callback to be called when done
-         @type done: protobuf.socketrpc.server.Callback
+         :param controller: used to mediate a single method call
+         :type controller: protobuf.socketrpc.controller.SocketRpcController
+         :param request: the request received from the component
+         :type request: leap.common.events.events_pb2.RegisterRequest
+         :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([])
          Perform an RPC call to signal all components registered to receive a
          specific signal.
  
-         @param controller: used to mediate a single method call
-         @type controller: protobuf.socketrpc.controller.SocketRpcController
-         @param request: the request received from the component
-         @type request: leap.common.events.events_pb2.SignalRequest
-         @param done: callback to be called when done
-         @type done: protobuf.socketrpc.server.Callback
+         :param controller: used to mediate a single method call
+         :type controller: protobuf.socketrpc.controller.SocketRpcController
+         :param request: the request received from the component
+         :type request: leap.common.events.events_pb2.SignalRequest
+         :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: