Skip to content

Commit 8ee1de8

Browse files
committed
Add some prefixes and tags to existing routers
1 parent 8f38607 commit 8ee1de8

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

src/murfey/server/__init__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
from sqlalchemy.orm.exc import ObjectDeletedError
4242
from sqlmodel import Session, create_engine, select
4343
from werkzeug.utils import secure_filename
44+
from workflows import Error as WorkflowsError
4445
from workflows.transport.pika_transport import PikaTransport
4546

4647
import murfey
@@ -287,8 +288,13 @@ def run():
287288
os.environ["MURFEY_DEMO"] = "1"
288289
else:
289290
# Load RabbitMQ configuration and set up the connection
290-
PikaTransport().load_configuration_file(security_config.rabbitmq_credentials)
291-
_set_up_transport("PikaTransport")
291+
try:
292+
PikaTransport().load_configuration_file(
293+
security_config.rabbitmq_credentials
294+
)
295+
_set_up_transport("PikaTransport")
296+
except WorkflowsError:
297+
pass
292298

293299
# Set up logging now that the desired verbosity is known
294300
_set_up_logging(quiet=args.quiet, verbosity=args.verbose)

src/murfey/server/api/instrument.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
from murfey.util.models import File, MultigridWatcherSetup
2828

2929
# Create APIRouter class object
30-
router = APIRouter(dependencies=[Depends(validate_token)])
30+
router = APIRouter(
31+
prefix="/instrument_server",
32+
dependencies=[Depends(validate_token)],
33+
tags=["instrument_server"],
34+
)
3135

3236
log = logging.getLogger("murfey.server.instrument")
3337

src/murfey/server/api/processing_parameters.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212

1313
logger = getLogger("murfey.server.api.processing_parameters")
1414

15-
router = APIRouter(dependencies=[Depends(validate_token)])
15+
router = APIRouter(
16+
prefix="/session_parameters",
17+
dependencies=[Depends(validate_token)],
18+
tags=["processing parameters"],
19+
)
1620

1721

1822
class EditableSessionProcessingParameters(BaseModel):

0 commit comments

Comments
 (0)