Fix API command 'shutdown'

This commit is contained in:
Dmitri Bogomolov 2019-07-22 12:03:48 +03:00
parent ae76d369f2
commit 9992626438
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13

View File

@ -204,6 +204,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
self.wfile.flush() self.wfile.flush()
self.connection.shutdown(1) self.connection.shutdown(1)
# actually handle shutdown command after sending response
if state.shutdown is False:
shutdown.doCleanShutdown()
def APIAuthenticateClient(self): def APIAuthenticateClient(self):
"""Predicate to check for valid API credentials in the request header""" """Predicate to check for valid API credentials in the request header"""
@ -1386,10 +1390,11 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
return None return None
def HandleShutdown(self, params): def HandleShutdown(self, params):
"""Handle a request to huutdown the client""" """Handle a request to shutdown the node"""
if not params: if not params:
shutdown.doCleanShutdown() # backward compatible trick because False == 0 is True
state.shutdown = False
return 'done' return 'done'
return None return None