adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added api server shutdown function, and exposed on HTTP as /stop_api url

Browse Source 
This will stop the running app gracefully - processing current api calls
then shutting the werkzueg (run) listening server.

Have also called this from the cleanup placeholder.
I'm not sure this is what is intended by cleanup def.
By which I mean there may be a thread left running with no app within -
not sure how to check this just yet.

tidied excessive logging.
This commit is contained in:
creslinux 2018-06-23 12:17:00 +00:00
parent 839d513bb8
commit eedcb64962
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
freqtrade/rpc/api_server.py
View File

@ -1,3 +1,4 @@
import json
import threading import threading
import logging import logging
# import json # import json
@ -13,7 +14,7 @@ logger = logging.getLogger(__name__)
app = Flask(__name__) app = Flask(__name__)
class ApiServerSuperWrap(RPC): class ApiServer(RPC):
""" """
This class is for REST calls across api server This class is for REST calls across api server
""" """
@ -78,14 +79,8 @@ class ApiServerSuperWrap(RPC):
except Exception: except Exception:
logger.exception("Api server failed to start, exception message is:") logger.exception("Api server failed to start, exception message is:")
@property
def name(self) -> str:
# TODO: implement me
raise NotImplementedError
def send_msg(self, msg: str) -> None: def send_msg(self, msg: str) -> None:
# TODO: implement me pass
raise NotImplementedError
def shutdown_api_server(self): def shutdown_api_server(self):
""" """
@ -111,14 +106,12 @@ class ApiServerSuperWrap(RPC):
""" """
self.shutdown_api_server() self.shutdown_api_server()
# def cleanup(self) -> None: # def cleanup(self) -> None:
# # TODO: implement me # pass
# raise NotImplementedError
""" """
Define the application methods here, called by app.add_url_rule Define the application methods here, called by app.add_url_rule
each Telegram command should have a like local substitute each Telegram command should have a like local substitute
""" """
def stop_api(self): def stop_api(self):
""" For calling shutdown_api_server over via api server HTTP""" """ For calling shutdown_api_server over via api server HTTP"""
self.shutdown_api_server() self.shutdown_api_server()
@ -178,7 +171,7 @@ class ApiServerSuperWrap(RPC):
Starts TradeThread in bot if stopped. Starts TradeThread in bot if stopped.
""" """
msg = self._rpc_start() msg = self._rpc_start()
return jsonify(msg) return json.dumps(msg)
def stop(self): def stop(self):
""" """
@ -187,4 +180,4 @@ class ApiServerSuperWrap(RPC):
Stops TradeThread in bot if running Stops TradeThread in bot if running
""" """
msg = self._rpc_stop() msg = self._rpc_stop()
return jsonify(msg) return json.dumps(msg)