From 7b668cb19d4e30fb9219d4041e3452ab1fc1343d Mon Sep 17 00:00:00 2001 From: Miguel Barão Date: Sun, 14 Jul 2019 00:37:52 +0100 Subject: [PATCH] changes to file serving by moving read() into the try block --- aprendizations/serve.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/aprendizations/serve.py b/aprendizations/serve.py index 0dc1739..915776a 100644 --- a/aprendizations/serve.py +++ b/aprendizations/serve.py @@ -218,16 +218,16 @@ class FileHandler(BaseHandler): content_type = mimetypes.guess_type(filename)[0] try: - f = open(filepath, 'rb') + with open(filepath, 'rb') as f: + data = f.read() except FileNotFoundError: logging.error(f'File not found: {filepath}') except PermissionError: logging.error(f'No permission: {filepath}') - except Exception as e: - raise e + except Exception: + logging.error(f'Error reading: {filepath}') + raise else: - data = f.read() - f.close() self.set_header("Content-Type", content_type) self.write(data) await self.flush() @@ -426,11 +426,9 @@ def parse_cmdline_arguments(): # ---------------------------------------------------------------------------- def get_logger_config(debug=False): if debug: - filename = 'logger-debug.yaml' - level = 'DEBUG' + filename, level = 'logger-debug.yaml', 'DEBUG' else: - filename = 'logger.yaml' - level = 'INFO' + filename, level = 'logger.yaml', 'INFO' config_dir = environ.get('XDG_CONFIG_HOME', '~/.config/') config_file = path.join(path.expanduser(config_dir), APP_NAME, filename) -- libgit2 0.21.2