Merge branch 'master' into redalert
This commit is contained in:
commit
591cd020b8
15 changed files with 153 additions and 184 deletions
|
@ -3,7 +3,6 @@ import logging.config
|
|||
logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False)
|
||||
|
||||
import logging
|
||||
import daemon
|
||||
import argparse
|
||||
import os
|
||||
import requests
|
||||
|
|
|
@ -40,6 +40,9 @@ class WorkerStatusHandler(BaseHTTPRequestHandler):
|
|||
# Return the worker status
|
||||
code = 200 if self.server.worker.is_healthy() else 503
|
||||
self.send_response(code)
|
||||
self.send_header('Content-Type', 'text/plain')
|
||||
self.end_headers()
|
||||
self.wfile.write('OK')
|
||||
elif self.path == '/terminate':
|
||||
# Return whether it is safe to terminate the worker process
|
||||
code = 200 if self.server.worker.is_terminated() else 503
|
||||
|
|
Reference in a new issue