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

Merge branch 'master' into 'hotfix-2.0.x'

Browse source 
# Conflicts:
#   openflexure_microscope/api/app.py
#   poetry.lock
#   pyproject.toml
This commit is contained in:
Joel Collins 2020-03-31 10:10:33 +00:00
commit 6f4791ec57
25 changed files with 11162 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openflexure_microscope/api/app.py
View file

@ -62,6 +62,7 @@ app, labthing = create_app(
prefix="/api/v2",
title=f"OpenFlexure Microscope {api_microscope.name}",
description="Test LabThing-based API for OpenFlexure Microscope",
types=["org.openflexure.microscope"],
version=pkg_resources.get_distribution("openflexure_microscope").version,
flask_kwargs={"static_url_path": ""},
)
@ -169,5 +170,9 @@ def cleanup():
atexit.register(cleanup)
# Start the app
if __name__ == "__main__":
app.run(host="0.0.0.0", port="5000", threaded=True, debug=True, use_reloader=False)
from labthings.server.wsgi import Server
server = Server(app)
server.run(host="0.0.0.0", port=5000, debug=False, zeroconf=True)