Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
ef49e2b5
Commit
ef49e2b5
authored
Aug 30, 2020
by
blitzmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert daemon in favor of timeout
parent
b0a055a8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
18 deletions
+29
-18
worker.py
cps/services/worker.py
+29
-18
No files found.
cps/services/worker.py
View file @
ef49e2b5
...
@@ -3,6 +3,7 @@ from __future__ import division, print_function, unicode_literals
...
@@ -3,6 +3,7 @@ from __future__ import division, print_function, unicode_literals
import
threading
import
threading
import
abc
import
abc
import
uuid
import
uuid
import
time
try
:
try
:
import
queue
import
queue
...
@@ -59,7 +60,7 @@ class WorkerThread(threading.Thread):
...
@@ -59,7 +60,7 @@ class WorkerThread(threading.Thread):
threading
.
Thread
.
__init__
(
self
)
threading
.
Thread
.
__init__
(
self
)
self
.
dequeued
=
list
()
self
.
dequeued
=
list
()
self
.
daemon
=
True
self
.
doLock
=
threading
.
Lock
()
self
.
doLock
=
threading
.
Lock
()
self
.
queue
=
ImprovedQueue
()
self
.
queue
=
ImprovedQueue
()
self
.
num
=
0
self
.
num
=
0
...
@@ -101,8 +102,18 @@ class WorkerThread(threading.Thread):
...
@@ -101,8 +102,18 @@ class WorkerThread(threading.Thread):
# Main thread loop starting the different tasks
# Main thread loop starting the different tasks
def
run
(
self
):
def
run
(
self
):
# this blocks until something is available
main_thread
=
_get_main_thread
()
item
=
self
.
queue
.
get
()
while
main_thread
.
is_alive
():
try
:
# this blocks until something is available. This can cause issues when the main thread dies - this
# thread will remain alive. We implement a timeout to unblock every second which allows us to check if
# the main thread is still alive.
# We don't use a daemon here because we don't want the tasks to just be abruptly halted, leading to
# possible file / database corruption
item
=
self
.
queue
.
get
(
timeout
=
1
)
except
queue
.
Empty
as
ex
:
time
.
sleep
(
1
)
continue
with
self
.
doLock
:
with
self
.
doLock
:
# add to list so that in-progress tasks show up
# add to list so that in-progress tasks show up
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment