Skip to content

Update when starting Instrument Server, and deprecate client #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tieneupin merged 2 commits into from
May 8, 2025
Merged

Update when starting Instrument Server, and deprecate client #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9947b
Run updates on instrument server startup
stephen-riggs May 2, 2025
5aa9d2f
Only start client if specifically requested
stephen-riggs May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ Bug-Tracker = "https://github.com/DiamondLightSource/python-murfey/issues"
Documentation = "https://github.com/DiamondLightSource/python-murfey"
GitHub = "https://github.com/DiamondLightSource/python-murfey"
[project.scripts]
murfey = "murfey.client:run"
"murfey.add_user" = "murfey.cli.add_user:run"
"murfey.client" = "murfey.client:run"
"murfey.create_db" = "murfey.cli.create_db:run"
"murfey.db_sql" = "murfey.cli.murfey_db_sql:run"
"murfey.decrypt_password" = "murfey.cli.decrypt_db_password:run"
Expand Down
8 changes: 8 additions & 0 deletions src/murfey/instrument_server/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import argparse
import logging
from urllib.parse import urlparse

import uvicorn
from rich.logging import RichHandler

import murfey
import murfey.client.update
from murfey.client.customlogging import CustomHandler
from murfey.util import LogFilter
from murfey.util.client import read_config
Expand All @@ -27,6 +29,12 @@ def run():
)
args = parser.parse_args()

murfey_url = urlparse(read_config()["Murfey"].get("server"), allow_fragments=False)
try:
murfey.client.update.check(murfey_url)
except Exception as e:
print(f"Murfey update check failed with {e}")

LogFilter.install()

rich_handler = RichHandler(enable_link_path=False)
Expand Down