barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stop calling glog.Fatal* in a bunch of places

Browse source
This commit is contained in:
Andrew Dunham 2015-04-15 14:07:45 -07:00
parent cacdb74e41
commit 1990eba055
7 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
graph/mongo/quadstore.go
View file

@ -57,7 +57,10 @@ func createNewMongoGraph(addr string, options graph.Options) error {
}
conn.SetSafe(&mgo.Safe{})
dbName := DefaultDBName
if val, ok := options.StringKey("database_name"); ok {
val, ok, err := options.StringKey("database_name")
if err != nil {
return err
} else if ok {
dbName = val
}
db := conn.DB(dbName)
@ -94,7 +97,10 @@ func newQuadStore(addr string, options graph.Options) (graph.QuadStore, error) {
}
conn.SetSafe(&mgo.Safe{})
dbName := DefaultDBName
if val, ok := options.StringKey("database_name"); ok {
val, ok, err := options.StringKey("database_name")
if err != nil {
return nil, err
} else if ok {
dbName = val
}
qs.db = conn.DB(dbName)