Skip to content

settings: support Settings.local.toml for local overrides #110

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

Open
kuba-moo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

settings: support Settings.local.toml for local overrides #110

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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ third_party/linux/
benchmarks/smoke-repo/
review_trees/
sashiko.log
Settings.toml
Settings.local.toml
email_policy.toml
1 change: 1 addition & 0 deletions src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ impl Settings {
let s = Config::builder()
// Start with default settings
.add_source(File::with_name("Settings"))
.add_source(File::with_name("Settings.local").required(false))
// Add settings from environment variables (with a prefix of SASHIKO)
// e.g. SASHIKO_SERVER__PORT=8081 would set the server port
.add_source(Environment::with_prefix("SASHIKO").separator("__"))
Expand Down