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

Load config and plugins at startup

Browse source
This commit is contained in:
Joel Collins 2018-12-12 15:02:19 +00:00
parent 71b5c685ca
commit d0e738c6af
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openflexure_microscope/api/app.py
View file

@ -30,7 +30,8 @@ import logging, sys
logging.basicConfig(stream=sys.stderr, level=logging.DEBUG) logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
# Create a dummy microscope object, with no hardware attachments # Create a dummy microscope object, with no hardware attachments
api_microscope = Microscope(None, None) openflexurerc = config.load_config() # Load default user config
api_microscope = Microscope(None, None, config=openflexurerc)
logging.debug("Created an empty microscope in global.") logging.debug("Created an empty microscope in global.")
@ -66,9 +67,8 @@ for code in default_exceptions:
@app.before_first_request @app.before_first_request
def attach_microscope(): def attach_microscope():
# Create the microscope object globally (common to all spawned server threads) # Create the microscope object globally (common to all spawned server threads)
global api_microscope global api_microscope, openflexurerc
logging.debug("First request made. Populating microscope with hardware...") logging.debug("First request made. Populating microscope with hardware...")
openflexurerc = config.load_config() # Load default user config
logging.debug("Creating camera object...") logging.debug("Creating camera object...")
api_camera = StreamingCamera(config=openflexurerc) api_camera = StreamingCamera(config=openflexurerc)
@ -81,9 +81,6 @@ def attach_microscope():
api_stage api_stage
) )
logging.debug("Attaching plugins to microscope...")
api_microscope.find_plugins() # Automatically find microscope plugins
logging.debug("Microscope successfully attached!") logging.debug("Microscope successfully attached!")