haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-13 13:51:53 +00:00
Code Issues Releases Wiki Activity

Allow comment sybols # and ; inside values (#615)

Browse Source 
Co-authored-by: heran yang <heran.yang@seafile.com>
This commit is contained in:
feiniks
2023-05-31 15:11:44 +08:00
committed by GitHub
parent 4d02cb14a3
commit 29e48dafa9
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fileserver/fileserver.go
View File

@@ -72,7 +72,9 @@ func (f *LogFormatter) Format(entry *log.Entry) ([]byte, error) {
func loadCcnetDB() { func loadCcnetDB() {
ccnetConfPath := filepath.Join(centralDir, "ccnet.conf") ccnetConfPath := filepath.Join(centralDir, "ccnet.conf")
config, err := ini.Load(ccnetConfPath) opts := ini.LoadOptions{}
opts.SpaceBeforeInlineComment = true
config, err := ini.LoadSources(opts, ccnetConfPath)
if err != nil { if err != nil {
log.Fatalf("Failed to load ccnet.conf: %v", err) log.Fatalf("Failed to load ccnet.conf: %v", err)
} }
@@ -171,7 +173,9 @@ func registerCA(capath string) {
func loadSeafileDB() { func loadSeafileDB() {
seafileConfPath := filepath.Join(centralDir, "seafile.conf") seafileConfPath := filepath.Join(centralDir, "seafile.conf")
config, err := ini.Load(seafileConfPath) opts := ini.LoadOptions{}
opts.SpaceBeforeInlineComment = true
config, err := ini.LoadSources(opts, seafileConfPath)
if err != nil { if err != nil {
log.Fatalf("Failed to load seafile.conf: %v", err) log.Fatalf("Failed to load seafile.conf: %v", err)
} }

4
fileserver/option/option.go
View File

@@ -80,7 +80,9 @@ func LoadFileServerOptions(centralDir string) {
seafileConfPath := filepath.Join(centralDir, "seafile.conf") seafileConfPath := filepath.Join(centralDir, "seafile.conf")
config, err := ini.Load(seafileConfPath) opts := ini.LoadOptions{}
opts.SpaceBeforeInlineComment = true
config, err := ini.LoadSources(opts, seafileConfPath)
if err != nil { if err != nil {
log.Fatalf("Failed to load seafile.conf: %v", err) log.Fatalf("Failed to load seafile.conf: %v", err)
} }

4
notification-server/server.go
View File

@@ -39,7 +39,9 @@ func init() {
func loadNotifConfig() { func loadNotifConfig() {
notifyConfPath := filepath.Join(configDir, "seafile.conf") notifyConfPath := filepath.Join(configDir, "seafile.conf")
config, err := ini.Load(notifyConfPath) opts := ini.LoadOptions{}
opts.SpaceBeforeInlineComment = true
config, err := ini.LoadSources(opts, notifyConfPath)
if err != nil { if err != nil {
log.Fatalf("Failed to load notification.conf: %v", err) log.Fatalf("Failed to load notification.conf: %v", err)
} }