alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'one-db' into 'master'

Browse Source 
merge datastores into sqlx package

See merge request !101
This commit is contained in:
Reed Allman
2017-07-11 11:30:41 -07:00
parent 0f83355f0a eed8555da6
commit 8d669c202c
104 changed files with 229573 additions and 2732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/server/server.go
View File

@@ -70,9 +70,12 @@ func NewFromEnv(ctx context.Context) *Server {
logrus.WithError(err).Fatal("Error initializing message queue.")
}
logDB, err := logs.New(viper.GetString(EnvLOGDBURL))
if err != nil {
logrus.WithError(err).Fatal("Error initializing logs store.")
var logDB models.FnLog = ds
if ldb := viper.GetString(EnvLOGDBURL); ldb != "" && ldb != viper.GetString(EnvDBURL) {
logDB, err = logs.New(viper.GetString(EnvLOGDBURL))
if err != nil {
logrus.WithError(err).Fatal("Error initializing logs store.")
}
}
apiURL := viper.GetString(EnvAPIURL)