Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos.toolbox
Commits
9bb954a9
Commit
9bb954a9
authored
Feb 16, 2015
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
equeue: move takeover detection in thread lock.
parent
9199b64d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
slapos/equeue/__init__.py
slapos/equeue/__init__.py
+3
-3
No files found.
slapos/equeue/__init__.py
View file @
9bb954a9
...
@@ -115,10 +115,10 @@ class EqueueServer(SocketServer.ThreadingUnixStreamServer):
...
@@ -115,10 +115,10 @@ class EqueueServer(SocketServer.ThreadingUnixStreamServer):
return
False
return
False
def
_runCommandIfNeeded
(
self
,
command
,
timestamp
):
def
_runCommandIfNeeded
(
self
,
command
,
timestamp
):
if
self
.
_hasTakeoverBeenTriggered
():
self
.
logger
.
info
(
'Takeover has been triggered, preventing to run import script.'
)
return
with
self
.
thread_lock
as
thread_lock
,
self
.
lockfile
as
lockfile
:
with
self
.
thread_lock
as
thread_lock
,
self
.
lockfile
as
lockfile
:
if
self
.
_hasTakeoverBeenTriggered
():
self
.
logger
.
info
(
'Takeover has been triggered, preventing to run import script.'
)
return
cmd_list
=
command
.
split
(
'
\
0
'
)
cmd_list
=
command
.
split
(
'
\
0
'
)
cmd_readable
=
' '
.
join
(
cmd_list
)
cmd_readable
=
' '
.
join
(
cmd_list
)
cmd_executable
=
cmd_list
[
0
]
cmd_executable
=
cmd_list
[
0
]
...
...
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