Remove update and read site config. Fixes #2306 #2329
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nutomic
reviewed
Jun 22, 2022
Nutomic
reviewed
Jun 22, 2022
Nutomic
reviewed
Jun 22, 2022
crates/utils/src/settings/mod.rs
Outdated
| pub fn get() -> Self { | ||
| SETTINGS.read().expect("read config").to_owned() | ||
| pub fn get() -> &'static Self { | ||
| &SETTINGS | ||
| } |
There was a problem hiding this comment.
You can probably remove this get() method, and make SETTINGS public instead. Also, i dont think Settings::init() needs to be public.
There was a problem hiding this comment.
I'll see how big a refactor this would be.
dessalines
force-pushed
the
disable_save_config_hjson
branch
from
4c0bdf0
to
3e35b4b
Compare
dessalines
commented
Jun 22, 2022
| @@ -29,7 +29,7 @@ impl Settings { | |||
| /// Note: The env var `LEMMY_DATABASE_URL` is parsed in | |||
| /// `lemmy_db_schema/src/lib.rs::get_database_url_from_env()` | |||
| /// Warning: Only call this once. | |||
| pub fn init() -> Result<Self, LemmyError> { | |||
| pub(crate) fn init() -> Result<Self, LemmyError> { | |||
There was a problem hiding this comment.
Made this crate only.
dessalines
commented
Jun 22, 2022
| /// Returns the config as a struct. | ||
| pub fn get() -> Self { | ||
| SETTINGS.read().expect("read config").to_owned() | ||
| } |
There was a problem hiding this comment.
Removed this public get.
Nutomic
approved these changes
Jun 22, 2022
Nutomic
force-pushed
the
disable_save_config_hjson
branch
from
3e35b4b
to
dc9f443
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.