summaryrefslogtreecommitdiff
path: root/src/leap/common/events/txclient.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-07-13 11:48:47 -0400
committerKali Kaneko <kali@leap.se>2015-07-21 13:26:57 -0400
commit467b14fa2e29ecd6f41d4834b00593d8c86cddc5 (patch)
tree90a55edfd571974bdb68ec4e65b5c068aa03dbcf /src/leap/common/events/txclient.py
parent87339921eac261954e39901e3563851830309cc5 (diff)
[feature] add global flag for disabling the events framework
this will be used to allow the unittests to disable the events framework. this way, emit() will become a passthrough. note that, until now, the basetest class is making use of the threaded version of the client, which launches a zmq tornado-based ioloop. this is wrong, and will have to be addressed in a future commit. we'll have to make use of the global EVENTS_ENABLED flag in the txclient version when those changes are made. Related: #7259 Relases: 0.4.2
Diffstat (limited to 'src/leap/common/events/txclient.py')
-rw-r--r--src/leap/common/events/txclient.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/leap/common/events/txclient.py b/src/leap/common/events/txclient.py
index 0dcfc08..dfd0533 100644
--- a/src/leap/common/events/txclient.py
+++ b/src/leap/common/events/txclient.py
@@ -14,8 +14,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
"""
The client end point of the events mechanism, implemented using txzmq.
@@ -27,8 +25,6 @@ When a client registers a callback for a given event, it also tells the
server that it wants to be notified whenever events of that type are sent by
some other client.
"""
-
-
import logging
import pickle
@@ -62,7 +58,7 @@ class EventsTxClient(TxZmqClientComponent, EventsClient):
"""
def __init__(self, emit_addr=EMIT_ADDR, reg_addr=REG_ADDR,
- path_prefix=None):
+ path_prefix=None):
"""
Initialize the events server.
"""