mirror of
https://github.com/paulscherrerinstitute/sf_daq_broker.git
synced 2026-08-31 09:50:42 +02:00
separated/re-use the error handler
This commit is contained in:
@@ -1,13 +1,12 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
import bottle
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
from .rest_api_error import register_error_handler
|
||||
|
||||
|
||||
def register_rest_interface(app, manager):
|
||||
|
||||
register_error_handler(app)
|
||||
|
||||
@app.post("/retrieve_from_buffers")
|
||||
def retrieve_from_buffers():
|
||||
return manager.retrieve(request=bottle.request.json, remote_ip=bottle.request.remote_addr)
|
||||
@@ -47,15 +46,3 @@ def register_rest_interface(app, manager):
|
||||
@app.post("/close_pgroup_writing")
|
||||
def close_pgroup_writing():
|
||||
return manager.close_pgroup_writing(request=bottle.request.json, remote_ip=bottle.request.remote_addr)
|
||||
|
||||
@app.error(500)
|
||||
def error_handler_500(error):
|
||||
bottle.response.content_type = "application/json"
|
||||
bottle.response.status = 200
|
||||
|
||||
error_text = str(error.exception)
|
||||
|
||||
_logger.error(error_text)
|
||||
|
||||
return json.dumps({"state": "error",
|
||||
"status": error_text})
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
import bottle
|
||||
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def register_error_handler(app):
|
||||
|
||||
@app.error(500)
|
||||
def error_handler_500(error):
|
||||
bottle.response.content_type = "application/json"
|
||||
bottle.response.status = 200
|
||||
|
||||
error_text = str(error.exception)
|
||||
|
||||
_logger.error(error_text)
|
||||
|
||||
return json.dumps({
|
||||
"state": "error",
|
||||
"status": error_text
|
||||
})
|
||||
@@ -1,13 +1,12 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
import bottle
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
from .rest_api_error import register_error_handler
|
||||
|
||||
|
||||
def register_rest_interface(app, manager):
|
||||
|
||||
register_error_handler(app)
|
||||
|
||||
@app.post("/get_detector_settings")
|
||||
def get_detector_settings():
|
||||
return manager.get_detector_settings(request=bottle.request.json, remote_ip=bottle.request.remote_addr)
|
||||
@@ -27,15 +26,3 @@ def register_rest_interface(app, manager):
|
||||
@app.post("/set_dap_settings")
|
||||
def set_dap_settings():
|
||||
return manager.set_dap_settings(request=bottle.request.json, remote_ip=bottle.request.remote_addr)
|
||||
|
||||
@app.error(500)
|
||||
def error_handler_500(error):
|
||||
bottle.response.content_type = "application/json"
|
||||
bottle.response.status = 200
|
||||
|
||||
error_text = str(error.exception)
|
||||
|
||||
_logger.error(error_text)
|
||||
|
||||
return json.dumps({"state": "error",
|
||||
"status": error_text})
|
||||
|
||||
Reference in New Issue
Block a user