rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style and linting

Browse source
This commit is contained in:
Joel Collins 2020-11-12 14:28:44 +00:00
parent b350f62013
commit f4b123c237
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/v2/views/captures.py
View file

@ -1,5 +1,3 @@
import logging
from flask import abort, redirect, request, send_file, url_for
from labthings import Schema, fields, find_component
from labthings.marshalling import marshal_with, use_args

2
openflexure_microscope/api/v2/views/instrument.py
View file

@ -1,6 +1,6 @@
import logging
from flask import abort, request
from flask import abort
from labthings import find_component, fields
from labthings.marshalling import use_args
from labthings.utilities import create_from_path, get_by_path, set_by_path

1
openflexure_microscope/paths.py
View file

@ -38,6 +38,7 @@ def logs_file_path(filename: str):
os.makedirs(logs_dir)
return os.path.join(logs_dir, filename)
# BASE PATHS
if os.name == "nt":

45
openflexure_microscope/rescue/check_settings.py
View file

@ -8,36 +8,41 @@ ERROR_SOURCES = []
def trace_config_exceptions():
error_sources = []
from openflexure_microscope.paths import (
CONFIGURATION_FILE_PATH,
SETTINGS_FILE_PATH,
)
from openflexure_microscope.paths import CONFIGURATION_FILE_PATH, SETTINGS_FILE_PATH
try:
default_config = json.load(CONFIGURATION_FILE_PATH)
if not default_config:
error_sources.append(ErrorSource(
"Configuration file is missing or empty. This may occur if the server has never been started."
))
error_sources.append(
ErrorSource(
"Configuration file is missing or empty. This may occur if the server has never been started."
)
)
except Exception as e: # pylint: disable=W0703
logging.error("Error parsing config:")
logging.error(e)
error_sources.append(ErrorSource(
f"Configuration file is malformed. You can reset to the default configuration by deleting {CONFIGURATION_FILE_PATH}."
))
error_sources.append(
ErrorSource(
f"Configuration file is malformed. You can reset to the default configuration by deleting {CONFIGURATION_FILE_PATH}."
)
)
try:
default_settings = json.load(SETTINGS_FILE_PATH)
if not default_settings:
error_sources.append(ErrorSource(
"Settings file is missing or empty. This may occur if the server has never been started."
))
error_sources.append(
ErrorSource(
"Settings file is missing or empty. This may occur if the server has never been started."
)
)
except Exception as e: # pylint: disable=W0703
logging.error("Error parsing settings:")
logging.error(e)
error_sources.append(ErrorSource(
f"Settings file is malformed. You can reset to the default settings by deleting {SETTINGS_FILE_PATH}."
))
error_sources.append(
ErrorSource(
f"Settings file is malformed. You can reset to the default settings by deleting {SETTINGS_FILE_PATH}."
)
)
return error_sources
@ -48,9 +53,11 @@ def main():
try:
from openflexure_microscope import config as _
except Exception as e: # pylint: disable=W0703
error_sources.append(ErrorSource(
"Error importing configuration submodule. This could be an error in our code."
))
error_sources.append(
ErrorSource(
"Error importing configuration submodule. This could be an error in our code."
)
)
logging.error("Error importing config:")
logging.error(e)
error_sources.extend(trace_config_exceptions())