diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-07-07 02:03:25 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-07-07 02:03:25 -0700 |
| commit | 2ad45ca04f2f805ea15133c626e0b5aa4159a67b (patch) | |
| tree | 461e8df44ab16feb828b9cd31b00cda58b675c12 | |
| parent | 5bfb72d058bc9198d90bbab9cd694f9248a64e34 (diff) | |
| download | seaweedfs-2ad45ca04f2f805ea15133c626e0b5aa4159a67b.tar.xz seaweedfs-2ad45ca04f2f805ea15133c626e0b5aa4159a67b.zip | |
refactor
| -rw-r--r-- | weed/command/filer.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index e5a3e379a..56429ce36 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -87,7 +87,7 @@ func (fo *FilerOptions) start() { masters := *f.masters 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.maxMB, *fo.secretKey, diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 6da6b5561..f5784e82d 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -2,7 +2,6 @@ package weed_server import ( "net/http" - "strconv" "github.com/chrislusf/seaweedfs/weed/filer2" _ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra" _ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb" @@ -15,7 +14,6 @@ import ( ) type FilerServer struct { - port string masters []string collection string defaultReplication string @@ -26,7 +24,7 @@ type FilerServer struct { 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, maxMB int, secret string, @@ -38,7 +36,6 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, ip string, port int, redirectOnRead: redirectOnRead, disableDirListing: disableDirListing, maxMB: maxMB, - port: ip + ":" + strconv.Itoa(port), } if len(masters) == 0 { |