Skip to content

Commit 5fd1bb8

Browse files
authored
Merge pull request #298 from splitio/fix_set_daemon
Removed set daemon method
2 parents 6cb418d + fa0d18b commit 5fd1bb8

File tree

11 files changed

+21
-38
lines changed

11 files changed

+21
-38
lines changed

splitio/client/factory.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ def _start_status_updater(self):
135135
self._status = Status.NOT_INITIALIZED
136136
# add a listener that updates the status to READY once the flag is set.
137137
ready_updater = threading.Thread(target=self._update_status_when_ready,
138-
name='SDKReadyFlagUpdater')
139-
ready_updater.setDaemon(True)
138+
name='SDKReadyFlagUpdater', daemon=True)
140139
ready_updater.start()
141140
else:
142141
self._status = Status.READY
@@ -225,8 +224,7 @@ def _wait_for_tasks_to_stop():
225224
self._sync_manager.stop(True)
226225
destroyed_event.set()
227226

228-
wait_thread = threading.Thread(target=_wait_for_tasks_to_stop)
229-
wait_thread.setDaemon(True)
227+
wait_thread = threading.Thread(target=_wait_for_tasks_to_stop, daemon=True)
230228
wait_thread.start()
231229
else:
232230
self._sync_manager.stop(False)
@@ -272,8 +270,8 @@ def resume(self):
272270
initialization_thread = threading.Thread(
273271
target=self._sync_manager.start,
274272
name="SDKInitializer",
273+
daemon=True
275274
)
276-
initialization_thread.setDaemon(True)
277275
initialization_thread.start()
278276
self._preforked_initialization = False # reset for status updater
279277
self._start_status_updater()
@@ -385,8 +383,7 @@ def _build_in_memory_factory(api_key, cfg, sdk_url=None, events_url=None, # pyl
385383
return SplitFactory(api_key, storages, cfg['labelsEnabled'],
386384
recorder, manager, preforked_initialization=preforked_initialization)
387385

388-
initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer")
389-
initialization_thread.setDaemon(True)
386+
initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer", daemon=True)
390387
initialization_thread.start()
391388

392389
return SplitFactory(api_key, storages, cfg['labelsEnabled'],
@@ -440,8 +437,7 @@ def _build_redis_factory(api_key, cfg):
440437
)
441438

442439
manager = RedisManager(synchronizer)
443-
initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer")
444-
initialization_thread.setDaemon(True)
440+
initialization_thread = threading.Thread(target=manager.start, name="SDKInitializer", daemon=True)
445441
initialization_thread.start()
446442

447443
return SplitFactory(

splitio/push/segmentworker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ def start(self):
5454
self._running = True
5555

5656
_LOGGER.debug('Starting Segment Worker')
57-
self._worker = threading.Thread(target=self._run, name='PushSegmentWorker')
58-
self._worker.setDaemon(True)
57+
self._worker = threading.Thread(target=self._run, name='PushSegmentWorker', daemon=True)
5958
self._worker.start()
6059

6160
def stop(self):

splitio/push/splitsse.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ def connect(url):
134134
self._on_disconnected()
135135

136136
url = self._build_url(token)
137-
task = threading.Thread(target=connect, name='SSEConnection', args=(url,))
138-
task.setDaemon(True)
137+
task = threading.Thread(target=connect, name='SSEConnection', args=(url,), daemon=True)
139138
task.start()
140139
event_group.wait()
141140
return self._status == SplitSSEClient._Status.CONNECTED

splitio/push/splitworker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def start(self):
5353
self._running = True
5454

5555
_LOGGER.debug('Starting Split Worker')
56-
self._worker = threading.Thread(target=self._run, name='PushSplitWorker')
57-
self._worker.setDaemon(True)
56+
self._worker = threading.Thread(target=self._run, name='PushSplitWorker', daemon=True)
5857
self._worker.start()
5958

6059
def stop(self):

splitio/sync/manager.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ def __init__(self, ready_flag, synchronizer, auth_api, streaming_enabled, sdk_me
5151
self._queue = Queue()
5252
self._push = PushManager(auth_api, synchronizer, self._queue, sdk_metadata, sse_url, client_key)
5353
self._push_status_handler = Thread(target=self._streaming_feedback_handler,
54-
name='PushStatusHandler')
55-
self._push_status_handler.setDaemon(True)
54+
name='PushStatusHandler', daemon=True)
5655

5756
def recreate(self):
5857
"""Recreate poolers for forked processes."""

splitio/tasks/util/asynctask.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ def start(self):
128128

129129
# Start execution
130130
self._thread = threading.Thread(target=self._execution_wrapper,
131-
name='AsyncTask::' + getattr(self._main, '__name__', 'N/S'))
132-
self._thread.setDaemon(True)
131+
name='AsyncTask::' + getattr(self._main, '__name__', 'N/S'), daemon=True)
133132
try:
134133
self._thread.start()
135134

splitio/tasks/util/workerpool.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, worker_count, worker_func):
2727
for i in range(0, worker_count)
2828
]
2929
for thread in self._threads:
30-
thread.setDaemon(True)
30+
thread.daemon = True
3131

3232
def start(self):
3333
"""Start the workers."""
@@ -116,8 +116,7 @@ def wait_for_completion(self):
116116

117117
def stop(self, event=None):
118118
"""Stop all worker nodes."""
119-
async_stop = Thread(target=self._wait_workers_shutdown, args=(event,))
120-
async_stop.setDaemon(True)
119+
async_stop = Thread(target=self._wait_workers_shutdown, args=(event,), daemon=True)
121120
async_stop.start()
122121

123122
def _wait_workers_shutdown(self, event):

splitio/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '9.2.2'
1+
__version__ = '9.2.3-rc1'

tests/helpers/mockserver.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ def __init__(self, req_queue=None):
2323
self._queue = queue.Queue()
2424
self._server = HTTPServer(('localhost', 0),
2525
lambda *xs: SSEHandler(self._queue, *xs, req_queue=req_queue))
26-
self._server_thread = threading.Thread(target=self._blocking_run)
27-
self._server_thread.setDaemon(True)
26+
self._server_thread = threading.Thread(target=self._blocking_run, daemon=True)
2827
self._done_event = threading.Event()
2928

3029
def _blocking_run(self):
@@ -116,8 +115,7 @@ def __init__(self, split_changes=None, segment_changes=None, req_queue=None,
116115
lambda *xs: SDKHandler(split_changes, segment_changes, *xs,
117116
req_queue=req_queue,
118117
auth_response=auth_response))
119-
self._server_thread = threading.Thread(target=self._blocking_run, name="SplitMockServer")
120-
self._server_thread.setDaemon(True)
118+
self._server_thread = threading.Thread(target=self._blocking_run, name="SplitMockServer", daemon=True)
121119
self._done_event = threading.Event()
122120

123121
def _blocking_run(self):

tests/push/test_manager.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ def test_connection_success(self, mocker):
3838

3939
def new_start(*args, **kwargs): # pylint: disable=unused-argument
4040
"""splitsse.start mock."""
41-
thread = Thread(target=manager._handle_connection_ready)
42-
thread.setDaemon(True)
41+
thread = Thread(target=manager._handle_connection_ready, daemon=True)
4342
thread.start()
4443
return True
4544

@@ -71,8 +70,7 @@ def test_connection_failure(self, mocker):
7170

7271
def new_start(*args, **kwargs): # pylint: disable=unused-argument
7372
"""splitsse.start mock."""
74-
thread = Thread(target=manager._handle_connection_end)
75-
thread.setDaemon(True)
73+
thread = Thread(target=manager._handle_connection_end, daemon=True)
7674
thread.start()
7775
return False
7876

0 commit comments

Comments
 (0)