third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-06-15 06:42:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #97 from Athanasius/bottle-app

Browse Source 
Switch bottle to using an 'app' instance.
This commit is contained in:
AnthorNet 2019-10-09 15:19:56 +02:00 committed by GitHub
commit 754e74c7c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/eddn/Gateway.py
View File

@ -21,7 +21,8 @@ from eddn.core.Validator import Validator, ValidationSeverity
from gevent import monkey from gevent import monkey
monkey.patch_all() monkey.patch_all()
from bottle import run, request, response, get, post from bottle import Bottle, run, request, response, get, post
app = Bottle()
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -158,7 +159,7 @@ def parse_and_error_handle(data):
return "FAIL: " + str(validationResults.messages) return "FAIL: " + str(validationResults.messages)
@post('/upload/') @app.post('/upload/')
def upload(): def upload():
response.set_header("Access-Control-Allow-Origin", "*") response.set_header("Access-Control-Allow-Origin", "*")
try: try:
@ -181,7 +182,7 @@ def upload():
return parse_and_error_handle(message_body) return parse_and_error_handle(message_body)
@get('/health_check/') @app.get('/health_check/')
def health_check(): def health_check():
""" """
This should only be used by the gateway monitoring script. It is used This should only be used by the gateway monitoring script. It is used
@ -191,7 +192,7 @@ def health_check():
return Settings.EDDN_VERSION return Settings.EDDN_VERSION
@get('/stats/') @app.get('/stats/')
def stats(): def stats():
response.set_header("Access-Control-Allow-Origin", "*") response.set_header("Access-Control-Allow-Origin", "*")
stats = statsCollector.getSummary() stats = statsCollector.getSummary()
@ -211,7 +212,7 @@ class MalformedUploadError(Exception):
def main(): def main():
loadConfig() loadConfig()
configure() configure()
run( app.run(
host=Settings.GATEWAY_HTTP_BIND_ADDRESS, host=Settings.GATEWAY_HTTP_BIND_ADDRESS,
port=Settings.GATEWAY_HTTP_PORT, port=Settings.GATEWAY_HTTP_PORT,
server='gevent', server='gevent',