Skip to content
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

[24.0] Use config_section to distinguish between galaxy and ts or other apps #18215

Merged
merged 1 commit into from
May 23, 2024
Merged

[24.0] Use config_section to distinguish between galaxy and ts or other apps #18215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/galaxy/util/properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def load_app_properties(
):
if config_file is None:
config_file = ini_file
config_section = ini_section
config_section = config_section or ini_section

# read from file or init w/no file
if config_file:
Expand Down
4 changes: 3 additions & 1 deletion lib/tool_shed/webapp/model/migrations/scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ def get_dburl_from_file(cwd: str, config_file: Optional[str] = None) -> str:
cwds = [cwd, os.path.join(cwd, CONFIG_DIR_NAME)]
config_file = find_config_file(DEFAULT_CONFIG_NAMES, dirs=cwds)

properties = load_app_properties(config_file=config_file, config_prefix=TOOLSHED_CONFIG_PREFIX)
properties = load_app_properties(
config_file=config_file, config_prefix=TOOLSHED_CONFIG_PREFIX, config_section="tool_shed"
)
default_url = f"sqlite:///{os.path.join(get_data_dir(properties), 'community.sqlite')}?isolation_level=IMMEDIATE"
url = properties.get("database_connection", default_url)
return url
Loading