diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
| commit | f7998f86522ef04717e22bb094f00138bdf18748 (patch) | |
| tree | 5d8454179564d52feae0ad78caa2648518f63eb8 /go/weed/filer.go | |
| parent | 714ccb6e2b709355bed617947ccaa6ad4b68b77b (diff) | |
| download | seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.tar.xz seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.zip | |
merge conflicts
Diffstat (limited to 'go/weed/filer.go')
| -rw-r--r-- | go/weed/filer.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/go/weed/filer.go b/go/weed/filer.go index 4e7191e34..fd7dcdf88 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -22,6 +22,7 @@ type FilerOptions struct { defaultReplicaPlacement *string dir *string redirectOnRead *bool + secretKey *string cassandra_server *string cassandra_keyspace *string redis_server *string @@ -40,6 +41,8 @@ func init() { f.cassandra_keyspace = cmdFiler.Flag.String("cassandra.keyspace", "seaweed", "keyspace of the cassandra server") f.redis_server = cmdFiler.Flag.String("redis.server", "", "host:port of the redis server, e.g., 127.0.0.1:6379") f.redis_database = cmdFiler.Flag.Int("redis.database", 0, "the database on the redis server") + f.secretKey = cmdFiler.Flag.String("secure.secret", "", "secret to encrypt Json Web Token(JWT)") + } var cmdFiler = &Command{ @@ -73,6 +76,7 @@ func runFiler(cmd *Command, args []string) bool { r := http.NewServeMux() _, nfs_err := weed_server.NewFilerServer(r, *f.port, *f.master, *f.dir, *f.collection, *f.defaultReplicaPlacement, *f.redirectOnRead, + *f.secretKey, *f.cassandra_server, *f.cassandra_keyspace, *f.redis_server, *f.redis_database, ) |