mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
refactor
This commit is contained in:
parent
5bfb72d058
commit
2ad45ca04f
|
@ -87,7 +87,7 @@ func (fo *FilerOptions) start() {
|
||||||
masters := *f.masters
|
masters := *f.masters
|
||||||
|
|
||||||
fs, nfs_err := weed_server.NewFilerServer(defaultMux, publicVolumeMux,
|
fs, nfs_err := weed_server.NewFilerServer(defaultMux, publicVolumeMux,
|
||||||
*fo.ip, *fo.port, strings.Split(masters, ","), *fo.collection,
|
strings.Split(masters, ","), *fo.collection,
|
||||||
*fo.defaultReplicaPlacement, *fo.redirectOnRead, *fo.disableDirListing,
|
*fo.defaultReplicaPlacement, *fo.redirectOnRead, *fo.disableDirListing,
|
||||||
*fo.maxMB,
|
*fo.maxMB,
|
||||||
*fo.secretKey,
|
*fo.secretKey,
|
||||||
|
|
|
@ -2,7 +2,6 @@ package weed_server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
|
||||||
"github.com/chrislusf/seaweedfs/weed/filer2"
|
"github.com/chrislusf/seaweedfs/weed/filer2"
|
||||||
_ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra"
|
_ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra"
|
||||||
_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb"
|
_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb"
|
||||||
|
@ -15,7 +14,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type FilerServer struct {
|
type FilerServer struct {
|
||||||
port string
|
|
||||||
masters []string
|
masters []string
|
||||||
collection string
|
collection string
|
||||||
defaultReplication string
|
defaultReplication string
|
||||||
|
@ -26,7 +24,7 @@ type FilerServer struct {
|
||||||
maxMB int
|
maxMB int
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, ip string, port int, masters []string, collection string,
|
func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, masters []string, collection string,
|
||||||
replication string, redirectOnRead bool, disableDirListing bool,
|
replication string, redirectOnRead bool, disableDirListing bool,
|
||||||
maxMB int,
|
maxMB int,
|
||||||
secret string,
|
secret string,
|
||||||
|
@ -38,7 +36,6 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, ip string, port int,
|
||||||
redirectOnRead: redirectOnRead,
|
redirectOnRead: redirectOnRead,
|
||||||
disableDirListing: disableDirListing,
|
disableDirListing: disableDirListing,
|
||||||
maxMB: maxMB,
|
maxMB: maxMB,
|
||||||
port: ip + ":" + strconv.Itoa(port),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(masters) == 0 {
|
if len(masters) == 0 {
|
||||||
|
|
Loading…
Reference in a new issue