Skip to content

Commit 203eaac

Browse files
committed
Renamed 'security_from_file' to 'server_config_from_file' for greater clarity
1 parent 3e13879 commit 203eaac

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/murfey/util/config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ class ServerConfig(BaseModel):
461461
allow_origins: List[str] = ["*"] # Restrict to only certain hostnames
462462

463463

464-
def security_from_file(config_file_path: Path) -> ServerConfig:
464+
def server_config_from_file(config_file_path: Path) -> ServerConfig:
465465
with open(config_file_path, "r") as config_stream:
466466
config = yaml.safe_load(config_stream)
467467
return ServerConfig(**config)
@@ -493,13 +493,13 @@ def get_microscope(machine_config: MachineConfig | None = None) -> str:
493493
@lru_cache(maxsize=1)
494494
def get_security_config() -> ServerConfig:
495495
if settings.murfey_security_configuration:
496-
return security_from_file(Path(settings.murfey_security_configuration))
496+
return server_config_from_file(Path(settings.murfey_security_configuration))
497497
if settings.murfey_machine_configuration and os.getenv("BEAMLINE"):
498498
machine_config = get_machine_config(instrument_name=os.getenv("BEAMLINE"))[
499499
os.getenv("BEAMLINE", "")
500500
]
501501
if machine_config.security_configuration_path:
502-
return security_from_file(machine_config.security_configuration_path)
502+
return server_config_from_file(machine_config.security_configuration_path)
503503
return ServerConfig(
504504
session_validation="",
505505
murfey_db_credentials="",

0 commit comments

Comments
 (0)