Skip to content

Commit 88a6f93

Browse files
Update when starting Instrument Server, and deprecate client (#586)
* Run updates on instrument server startup * Only start client if specifically requested
1 parent 35d82aa commit 88a6f93

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ Bug-Tracker = "https://github.com/DiamondLightSource/python-murfey/issues"
8080
Documentation = "https://github.com/DiamondLightSource/python-murfey"
8181
GitHub = "https://github.com/DiamondLightSource/python-murfey"
8282
[project.scripts]
83-
murfey = "murfey.client:run"
8483
"murfey.add_user" = "murfey.cli.add_user:run"
84+
"murfey.client" = "murfey.client:run"
8585
"murfey.create_db" = "murfey.cli.create_db:run"
8686
"murfey.db_sql" = "murfey.cli.murfey_db_sql:run"
8787
"murfey.decrypt_password" = "murfey.cli.decrypt_db_password:run"

src/murfey/instrument_server/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import argparse
22
import logging
3+
from urllib.parse import urlparse
34

45
import uvicorn
56
from rich.logging import RichHandler
67

78
import murfey
9+
import murfey.client.update
810
from murfey.client.customlogging import CustomHandler
911
from murfey.util import LogFilter
1012
from murfey.util.client import read_config
@@ -27,6 +29,12 @@ def run():
2729
)
2830
args = parser.parse_args()
2931

32+
murfey_url = urlparse(read_config()["Murfey"].get("server"), allow_fragments=False)
33+
try:
34+
murfey.client.update.check(murfey_url)
35+
except Exception as e:
36+
print(f"Murfey update check failed with {e}")
37+
3038
LogFilter.install()
3139

3240
rich_handler = RichHandler(enable_link_path=False)

0 commit comments

Comments
 (0)