diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-01-13 00:45:26 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-01-13 00:45:26 -0800 |
| commit | 5afdc469a3d96c168e250af1c16a5c4419accedc (patch) | |
| tree | 620ffcba8e41190c74ca0b91fec0ec2b1d93db35 /go/weed/server.go | |
| parent | 09bc196958328360a4e437b29e3d81ecd60b737a (diff) | |
| download | seaweedfs-5afdc469a3d96c168e250af1c16a5c4419accedc.tar.xz seaweedfs-5afdc469a3d96c168e250af1c16a5c4419accedc.zip | |
Separate into admin and public mux for volume servers.
Diffstat (limited to 'go/weed/server.go')
| -rw-r--r-- | go/weed/server.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/go/weed/server.go b/go/weed/server.go index 0b973f7e1..1bb0ab0a7 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -81,10 +81,10 @@ func init() { filerOptions.dir = cmdServer.Flag.String("filer.dir", "", "directory to store meta data, default to a 'filer' sub directory of what -mdir is specified") filerOptions.defaultReplicaPlacement = cmdServer.Flag.String("filer.defaultReplicaPlacement", "", "Default replication type if not specified during runtime.") filerOptions.redirectOnRead = cmdServer.Flag.Bool("filer.redirectOnRead", false, "whether proxy or redirect to volume server during file GET request") - filerOptions.cassandra_server = cmdFiler.Flag.String("filer.cassandra.server", "", "host[:port] of the cassandra server") - filerOptions.cassandra_keyspace = cmdFiler.Flag.String("filer.cassandra.keyspace", "seaweed", "keyspace of the cassandra server") + filerOptions.cassandra_server = cmdServer.Flag.String("filer.cassandra.server", "", "host[:port] of the cassandra server") + filerOptions.cassandra_keyspace = cmdServer.Flag.String("filer.cassandra.keyspace", "seaweed", "keyspace of the cassandra server") filerOptions.redis_server = cmdServer.Flag.String("filer.redis.server", "", "host:port of the redis server, e.g., 127.0.0.1:6379") - filerOptions.redis_database = cmdFiler.Flag.Int("filer.redis.database", 0, "the database on the redis server") + filerOptions.redis_database = cmdServer.Flag.Int("filer.redis.database", 0, "the database on the redis server") } @@ -224,7 +224,7 @@ func runServer(cmd *Command, args []string) bool { volumeWait.Wait() time.Sleep(100 * time.Millisecond) r := http.NewServeMux() - volumeServer := weed_server.NewVolumeServer(r, *serverIp, *volumePort, *serverPublicIp, folders, maxCounts, + volumeServer := weed_server.NewVolumeServer(r, r, *serverIp, *volumePort, *serverPublicIp, folders, maxCounts, *serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, serverWhiteList, *volumeFixJpgOrientation, ) |