diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2016-12-12 20:06:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 20:06:26 -0800 |
| commit | 6b5867ce9d5d4c3b38df963acaf609a607fc3fd3 (patch) | |
| tree | 9f7c3c86a9383f62eefde419807100b15f617b80 /weed/server/filer_server.go | |
| parent | cc34ac0bd5de14bc6eb33f456fd0f4b3032cdf88 (diff) | |
| parent | 43e655afc876f443c896300c98fc9d1d9469340f (diff) | |
| download | seaweedfs-6b5867ce9d5d4c3b38df963acaf609a607fc3fd3.tar.xz seaweedfs-6b5867ce9d5d4c3b38df963acaf609a607fc3fd3.zip | |
Merge pull request #414 from mtolman/master
Updating PostgreSQL file store integration to support directories.
Diffstat (limited to 'weed/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index fc7799efc..4a0b2103b 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -25,7 +25,7 @@ import ( type filerConf struct { MysqlConf []mysql_store.MySqlConf `json:"mysql"` mysql_store.ShardingConf - PostgresConf []postgres_store.PostgresConf `json:"postgres"` + PostgresConf *postgres_store.PostgresConf `json:"postgres"` } func parseConfFile(confPath string) (*filerConf, error) { @@ -88,9 +88,8 @@ func NewFilerServer(r *http.ServeMux, ip string, port int, master string, dir st if setting.MysqlConf != nil && len(setting.MysqlConf) != 0 { mysql_store := mysql_store.NewMysqlStore(setting.MysqlConf, setting.IsSharding, setting.ShardCount) fs.filer = flat_namespace.NewFlatNamespaceFiler(master, mysql_store) - } else if setting.PostgresConf != nil && len(setting.PostgresConf) != 0 { - postgres_store := postgres_store.NewPostgresStore(setting.PostgresConf, setting.IsSharding, setting.ShardCount) - fs.filer = flat_namespace.NewFlatNamespaceFiler(master, postgres_store) + } else if setting.PostgresConf != nil { + fs.filer = postgres_store.NewPostgresStore(master, *setting.PostgresConf) } else if cassandra_server != "" { cassandra_store, err := cassandra_store.NewCassandraStore(cassandra_keyspace, cassandra_server) if err != nil { |