1
0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-09 11:18:54 +00:00

compatible with httpserver (#470)

This commit is contained in:
Xiangyue Cai
2021-06-18 15:23:36 +08:00
committed by GitHub
parent 5cb36566ce
commit 1a81f671e3

View File

@@ -220,39 +220,9 @@ func loadFileServerOptions() {
initDefaultOptions() initDefaultOptions()
if section, err := config.GetSection("fileserver"); err == nil { if section, err := config.GetSection("fileserver"); err == nil {
if key, err := section.GetKey("host"); err == nil { parseFileServerSection(section)
options.host = key.String() } else if section, err := config.GetSection("httpserver"); err == nil {
} parseFileServerSection(section)
if key, err := section.GetKey("port"); err == nil {
port, err := key.Uint()
if err == nil {
options.port = uint32(port)
}
}
if key, err := section.GetKey("max_indexing_threads"); err == nil {
threads, err := key.Uint()
if err == nil {
options.maxIndexingThreads = uint32(threads)
}
}
if key, err := section.GetKey("fixed_block_size"); err == nil {
blkSize, err := key.Uint64()
if err == nil {
options.fixedBlockSize = blkSize
}
}
if key, err := section.GetKey("web_token_expire_time"); err == nil {
expire, err := key.Uint()
if err == nil {
options.webTokenExpireTime = uint32(expire)
}
}
if key, err := section.GetKey("cluster_shared_temp_file_mode"); err == nil {
fileMode, err := key.Uint()
if err == nil {
options.clusterSharedTempFileMode = uint32(fileMode)
}
}
} }
ccnetConfPath := filepath.Join(centralDir, "ccnet.conf") ccnetConfPath := filepath.Join(centralDir, "ccnet.conf")
@@ -268,6 +238,42 @@ func loadFileServerOptions() {
} }
} }
func parseFileServerSection(section *ini.Section) {
if key, err := section.GetKey("host"); err == nil {
options.host = key.String()
}
if key, err := section.GetKey("port"); err == nil {
port, err := key.Uint()
if err == nil {
options.port = uint32(port)
}
}
if key, err := section.GetKey("max_indexing_threads"); err == nil {
threads, err := key.Uint()
if err == nil {
options.maxIndexingThreads = uint32(threads)
}
}
if key, err := section.GetKey("fixed_block_size"); err == nil {
blkSize, err := key.Uint64()
if err == nil {
options.fixedBlockSize = blkSize
}
}
if key, err := section.GetKey("web_token_expire_time"); err == nil {
expire, err := key.Uint()
if err == nil {
options.webTokenExpireTime = uint32(expire)
}
}
if key, err := section.GetKey("cluster_shared_temp_file_mode"); err == nil {
fileMode, err := key.Uint()
if err == nil {
options.clusterSharedTempFileMode = uint32(fileMode)
}
}
}
func initDefaultOptions() { func initDefaultOptions() {
options.host = "0.0.0.0" options.host = "0.0.0.0"
options.port = 8082 options.port = 8082