Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tutorius/TProbe.py
diff options
context:
space:
mode:
Diffstat (limited to 'tutorius/TProbe.py')
-rw-r--r--tutorius/TProbe.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tutorius/TProbe.py b/tutorius/TProbe.py
index e58dd03..02352af 100644
--- a/tutorius/TProbe.py
+++ b/tutorius/TProbe.py
@@ -361,7 +361,7 @@ class ProbeProxy:
del self._actions[this_action]
break
- def __update_event(self, event, callback, event_subscribed_cb, address):
+ def __update_event(self, event_name, event, callback, event_subscribed_cb, address):
LOGGER.debug("ProbeProxy :: Registered event %s with address %s", str(hash(event)), str(address))
# Since multiple callbacks could be associated to the same
# event signature, we will store multiple callbacks
@@ -410,7 +410,7 @@ class ProbeProxy:
else:
LOGGER.debug("ProbeProxy :: unsubsribe address %s inconsistency : not registered", address)
- def subscribe(self, event, notification_cb, event_subscribed_cb, error_cb):
+ def subscribe(self, event_name, event, notification_cb, event_subscribed_cb, error_cb):
"""
Register an event listener
@param event Event to listen for
@@ -427,7 +427,7 @@ class ProbeProxy:
# for event types and sources, we will need to revise the lookup
# mecanism for which callback function to call
self._probe.subscribe(pickle.dumps(event),
- reply_handler=save_args(self.__update_event, event, notification_cb, event_subscribed_cb),
+ reply_handler=save_args(self.__update_event, event_name, event, notification_cb, event_subscribed_cb),
error_handler=save_args(error_cb, event))
def unsubscribe(self, address, block=True):
@@ -528,7 +528,7 @@ class ProbeManager(object):
else:
raise RuntimeWarning("No activity attached")
- def subscribe(self, event, notification_cb, event_subscribed_cb, error_cb):
+ def subscribe(self, event_name, event, notification_cb, event_subscribed_cb, error_cb):
"""
Register an event listener
@param event Event to listen for
@@ -540,7 +540,7 @@ class ProbeManager(object):
@return address identifier used for unsubscribing
"""
if self.currentActivity:
- return self._first_proxy(self.currentActivity).subscribe(event, notification_cb,\
+ return self._first_proxy(self.currentActivity).subscribe(event_name, event, notification_cb,\
event_subscribed_cb, error_cb)
else:
raise RuntimeWarning("No activity attached")