Read database config from seafile.conf and env #713
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
feiniks
force-pushed
the
del_ccnet_conf
branch
from
6d0c091
to
10f450b
Compare
feiniks
force-pushed
the
del_ccnet_conf
branch
from
b6f0137
to
33764d6
Compare
feiniks
force-pushed
the
del_ccnet_conf
branch
2 times, most recently
from
f4ba84e
to
c6ecfb1
Compare
feiniks
force-pushed
the
del_ccnet_conf
branch
from
c6ecfb1
to
0edea22
Compare
killing
reviewed
Nov 5, 2024
common/seaf-utils.c
Outdated
| option->ccnet_db_name = g_strdup (env_ccnet_db); | ||
| } else if (!option->ccnet_db_name) { | ||
| option->ccnet_db_name = g_strdup ("ccnet_db"); | ||
| seaf_message ("Failed to read SEAFILE_MYSQL_DB_CCNET_DB_NAME, use ccnet_db by default"); |
| @@ -190,51 +185,6 @@ ccnet_user_manager_set_max_users (CcnetUserManager *manager, gint64 max_users) | |||
|
|
|||
| static int try_load_ldap_settings (CcnetUserManager *manager) | |||
| { | |||
| GKeyFile *config = manager->session->ccnet_config; | |||
| // user is required. | ||
| if key, err = section.GetKey("user"); err != nil { | ||
| return dbOpt, fmt.Errorf("no database user in seafile.conf.") | ||
| } |
| if dbOpt.Host == "" && dbOpt.UnixSocket == "" { | ||
| return nil, fmt.Errorf("no database host in seafile.conf.") | ||
| } | ||
| if dbOpt.User == "" { |
There was a problem hiding this comment.
这个是否只有在没有配置 unix_socket 的情况下，才需要报错？
我觉得 unix_socket 这个选项可以去掉不再支持了，这样代码能简化不少。我们官方文档现在也没有这个配置选项的文档了。
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.