Merge pull request #1967 from skytoup/master

Fix #1965: About gunicorn [CRITICAL] Worker Timeout

Author: tilgovi

gunicorn/arbiter.py

@@ -495,7 +495,7 @@ def murder_workers(self):
         workers = list(self.WORKERS.items())
         for (pid, worker) in workers:
             try:
-                if time.time() - worker.tmp.last_update() <= self.timeout:
+                if time.monotonic() - worker.tmp.last_update() <= self.timeout:
                     continue
             except (OSError, ValueError):
                 continue

gunicorn/workers/workertmp.py

@@ -4,6 +4,7 @@
 # See the NOTICE for more information.
 
 import os
+import time
 import platform
 import tempfile
 
@@ -40,10 +41,11 @@ def __init__(self, cfg):
             raise
 
     def notify(self):
-        os.utime(self._tmp.fileno())
+        new_time = time.monotonic()
+        os.utime(self._tmp.fileno(), (new_time, new_time))
 
     def last_update(self):
-        return os.fstat(self._tmp.fileno()).st_ctime
+        return os.fstat(self._tmp.fileno()).st_mtime
 
     def fileno(self):
         return self._tmp.fileno()