Skip to content

Commit 041d072

Browse files
Boris-codeBoris-code
committed
version 1.8.6b2, fix _stop property conflict with thread
1 parent ae507ed commit 041d072

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎feapder/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8.6-beta1
1+
1.8.6-beta2

‎feapder/core/scheduler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def __init__(
155155
# 重置丢失的任务
156156
self.reset_task()
157157

158-
self._stop = False
158+
self._stop_spider = False
159159

160160
def init_metrics(self):
161161
"""
@@ -590,4 +590,4 @@ def reset_task(self, heartbeat_interval=10):
590590
log.info("重置丢失任务完毕，共{}条".format(len(datas)))
591591

592592
def stop_spider(self):
593-
self._stop = True
593+
self._stop_spider = True

‎feapder/core/spiders/air_spider.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, thread_count=None):
4646
db=self._memory_db, dedup_name=self.name
4747
)
4848

49-
self._stop = False
49+
self._stop_spider = False
5050
metrics.init(**setting.METRICS_OTHER_ARGS)
5151

5252
def distribute_task(self):
@@ -98,7 +98,7 @@ def run(self):
9898

9999
while True:
100100
try:
101-
if self._stop or self.all_thread_is_done():
101+
if self._stop_spider or self.all_thread_is_done():
102102
# 停止 parser_controls
103103
for parser_control in self._parser_controls:
104104
parser_control.stop()
@@ -136,4 +136,4 @@ def join(self, timeout=None):
136136
super().join()
137137

138138
def stop_spider(self):
139-
self._stop = True
139+
self._stop_spider = True

‎feapder/core/spiders/batch_spider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ def run(self):
10021002

10031003
while True:
10041004
try:
1005-
if self._stop or (
1005+
if self._stop_spider or (
10061006
self.task_is_done() and self.all_thread_is_done()
10071007
): # redis全部的任务已经做完 并且mysql中的任务已经做完（检查各个线程all_thread_is_done，防止任务没做完，就更新任务状态，导致程序结束的情况）
10081008
if not self._is_notify_end:

‎feapder/core/spiders/spider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def run(self):
184184

185185
while True:
186186
try:
187-
if self._stop or self.all_thread_is_done():
187+
if self._stop_spider or self.all_thread_is_done():
188188
if not self._is_notify_end:
189189
self.spider_end() # 跑完一轮
190190
self._is_notify_end = True

‎feapder/core/spiders/task_spider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def run(self):
516516

517517
while True:
518518
try:
519-
if self._stop or (
519+
if self._stop_spider or (
520520
self.all_thread_is_done()
521521
and self.task_is_done()
522522
and self.related_spider_is_done()

0 commit comments

Comments
 (0)