aboutsummaryrefslogtreecommitdiff
path: root/weed/command/filer.go
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2016-09-07 21:07:11 -0700
committerGitHub <noreply@github.com>2016-09-07 21:07:11 -0700
commit99e47fc5fcd5743324feda9498a699717761924d (patch)
treeb57f95a290b27c8b83abaf953ab5c47b8ef1ce82 /weed/command/filer.go
parent0559aa96738d727e055190301bbb0624c74ced7f (diff)
parent78474409a596aabd8e579716ba1f4939e7d62579 (diff)
downloadseaweedfs-99e47fc5fcd5743324feda9498a699717761924d.tar.xz
seaweedfs-99e47fc5fcd5743324feda9498a699717761924d.zip
Merge pull request #361 from hxiaodon/master
add mysql filer support
Diffstat (limited to 'weed/command/filer.go')
-rw-r--r--weed/command/filer.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go
index 0bd508e0b..7d90707a6 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -24,7 +24,8 @@ type FilerOptions struct {
dir *string
redirectOnRead *bool
disableDirListing *bool
- maxMB *int
+ confFile *string
+ maxMB *int
secretKey *string
cassandra_server *string
cassandra_keyspace *string
@@ -43,6 +44,7 @@ func init() {
f.defaultReplicaPlacement = cmdFiler.Flag.String("defaultReplicaPlacement", "000", "default replication type if not specified")
f.redirectOnRead = cmdFiler.Flag.Bool("redirectOnRead", false, "whether proxy or redirect to volume server during file GET request")
f.disableDirListing = cmdFiler.Flag.Bool("disableDirListing", false, "turn off directory listing")
+ f.confFile = cmdFiler.Flag.String("confFile", "", "json encoded filer conf file")
f.maxMB = cmdFiler.Flag.Int("maxMB", 0, "split files larger than the limit")
f.cassandra_server = cmdFiler.Flag.String("cassandra.server", "", "host[:port] of the cassandra server")
f.cassandra_keyspace = cmdFiler.Flag.String("cassandra.keyspace", "seaweed", "keyspace of the cassandra server")
@@ -84,6 +86,7 @@ func runFiler(cmd *Command, args []string) bool {
r := http.NewServeMux()
_, nfs_err := weed_server.NewFilerServer(r, *f.ip, *f.port, *f.master, *f.dir, *f.collection,
*f.defaultReplicaPlacement, *f.redirectOnRead, *f.disableDirListing,
+ *f.confFile,
*f.maxMB,
*f.secretKey,
*f.cassandra_server, *f.cassandra_keyspace,