diff --git a/fileserver/fileserver.go b/fileserver/fileserver.go index d288968..bd41b70 100644 --- a/fileserver/fileserver.go +++ b/fileserver/fileserver.go @@ -220,39 +220,9 @@ func loadFileServerOptions() { initDefaultOptions() if section, err := config.GetSection("fileserver"); err == nil { - 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) - } - } + parseFileServerSection(section) + } else if section, err := config.GetSection("httpserver"); err == nil { + parseFileServerSection(section) } 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() { options.host = "0.0.0.0" options.port = 8082