Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-05-12 03:05:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

added basic logging

Browse source
This commit is contained in:
Jan Friedli 2020-08-21 12:00:39 +02:00 • committed by jfriedli
parent e8bd56b5b4
commit a768cf3227
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main.py
View file

@ -57,7 +57,7 @@ def create_app(test_config=None):
Swagger(app, template=template, config=swagger_config) Swagger(app, template=template, config=swagger_config)
CORS(app, resources={r"/api/*": {"origins": utils.get_allow_origin_header_value()}}) CORS(app, resources={r"/api/*": {"origins": utils.get_allow_origin_header_value()}})
app.logger.info('Matweb started')
return app return app

15
matweb/rest_api.py
View file

@ -30,22 +30,26 @@ class APIUpload(Resource):
args = req_parser.parse_args() args = req_parser.parse_args()
try: try:
file_data = base64.b64decode(args['file']) file_data = base64.b64decode(args['file'])
except (binascii.Error, ValueError): except (binascii.Error, ValueError) as e:
current_app.logger.error('Upload - Decoding base64 file %s', str(e))
abort(400, message='Failed decoding file') abort(400, message='Failed decoding file')
file = FileStorage(stream=io.BytesIO(file_data), filename=args['file_name']) file = FileStorage(stream=io.BytesIO(file_data), filename=args['file_name'])
try: try:
filename, filepath = utils.save_file(file, current_app.config['UPLOAD_FOLDER']) filename, filepath = utils.save_file(file, current_app.config['UPLOAD_FOLDER'])
except ValueError: except ValueError:
current_app.logger.error('Upload - Invalid file name')
abort(400, message='Invalid Filename') abort(400, message='Invalid Filename')
parser, mime = utils.get_file_parser(filepath) parser, mime = utils.get_file_parser(filepath)
if parser is None: if parser is None:
current_app.logger.error('Upload - Invalid mime type %s', mime)
abort(415, message='The type %s is not supported' % mime) abort(415, message='The type %s is not supported' % mime)
meta = parser.get_meta() meta = parser.get_meta()
if not parser.remove_all(): if not parser.remove_all():
current_app.logger.error('Upload - Cleaning failed with mime: %s', mime)
abort(500, message='Unable to clean %s' % mime) abort(500, message='Unable to clean %s' % mime)
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, current_app.config['UPLOAD_FOLDER']) key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, current_app.config['UPLOAD_FOLDER'])
@ -140,7 +144,9 @@ class APIBulkDownloadCreator(Resource):
data = request.json data = request.json
if not data: if not data:
abort(400, message="Post Body Required") abort(400, message="Post Body Required")
current_app.logger.error('BulkDownload - Missing Post Body')
if not self.v.validate(data): if not self.v.validate(data):
current_app.logger.error('BulkDownload - Missing Post Body: %s', str(self.v.errors))
abort(400, message=self.v.errors) abort(400, message=self.v.errors)
# prevent the zip file from being overwritten # prevent the zip file from being overwritten
zip_filename = 'files.' + str(uuid4()) + '.zip' zip_filename = 'files.' + str(uuid4()) + '.zip'
@ -157,16 +163,19 @@ class APIBulkDownloadCreator(Resource):
try: try:
cleaned_files_zip.write(complete_path) cleaned_files_zip.write(complete_path)
os.remove(complete_path) os.remove(complete_path)
except ValueError: except ValueError as e:
current_app.logger.error('BulkDownload - Creating archive failed: %s', str(e))
abort(400, message='Creating the archive failed') abort(400, message='Creating the archive failed')
try: try:
cleaned_files_zip.testzip() cleaned_files_zip.testzip()
except ValueError as e: except ValueError as e:
abort(400, message=str(e)) current_app.logger.error('BulkDownload - Validating Zip failed: %s', str(e))
abort(400, message='Validating Zip failed')
parser, mime = utils.get_file_parser(zip_path) parser, mime = utils.get_file_parser(zip_path)
if not parser.remove_all(): if not parser.remove_all():
current_app.logger.error('BulkDownload - Unable to clean Zip')
abort(500, message='Unable to clean %s' % mime) abort(500, message='Unable to clean %s' % mime)
key, secret, meta_after, output_filename = utils.cleanup(parser, zip_path, current_app.config['UPLOAD_FOLDER']) key, secret, meta_after, output_filename = utils.cleanup(parser, zip_path, current_app.config['UPLOAD_FOLDER'])
return { return {