From 9bb954a936f955792d8177dc454fda7235168a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Mon, 16 Feb 2015 07:32:32 +0100
Subject: [PATCH] equeue: move takeover detection in thread lock.

---
 slapos/equeue/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/slapos/equeue/__init__.py b/slapos/equeue/__init__.py
index 78f7281..fd3be4c 100644
--- a/slapos/equeue/__init__.py
+++ b/slapos/equeue/__init__.py
@@ -115,10 +115,10 @@ class EqueueServer(SocketServer.ThreadingUnixStreamServer):
     return False
 
   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:
+      if self._hasTakeoverBeenTriggered():
+        self.logger.info('Takeover has been triggered, preventing to run import script.')
+        return
       cmd_list = command.split('\0')
       cmd_readable = ' '.join(cmd_list)
       cmd_executable = cmd_list[0]
-- 
2.30.9