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

Unify env variables naming into constants (#127)

Browse Source
This commit is contained in:
C Cirello
2016-10-06 02:01:11 +02:00
committed by Seif Lotfy سيف لطفي
parent aa12f3c724
commit c6f81ff921
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
main.go
View File

@@ -16,18 +16,27 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
const (
envLogLevel = "log_level"
envMQ = "mq"
envDB = "db"
envPort = "port" // be careful, Gin expects this variable to be "port"
envAPIURL = "tasks_url"
envNumAsync = "nasync"
)
func init() { func init() {
cwd, err := os.Getwd() cwd, err := os.Getwd()
if err != nil { if err != nil {
log.WithError(err) log.WithError(err)
} }
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
viper.SetDefault("log_level", "info") viper.SetDefault(envLogLevel, "info")
viper.SetDefault("mq", fmt.Sprintf("bolt://%s/data/worker_mq.db", cwd)) viper.SetDefault(envMQ, fmt.Sprintf("bolt://%s/data/worker_mq.db", cwd))
viper.SetDefault("db", fmt.Sprintf("bolt://%s/data/bolt.db?bucket=funcs", cwd)) viper.SetDefault(envDB, fmt.Sprintf("bolt://%s/data/bolt.db?bucket=funcs", cwd))
viper.SetDefault("port", 8080) viper.SetDefault(envPort, 8080)
viper.SetDefault("tasks_url", fmt.Sprintf("http://localhost:%d", viper.GetInt("port"))) viper.SetDefault(envAPIURL, fmt.Sprintf("http://localhost:%d", viper.GetInt(envPort)))
viper.SetDefault("nasync", 1) viper.SetDefault(envNumAsync, 1)
viper.SetConfigName("config") viper.SetConfigName("config")
viper.AddConfigPath(".") viper.AddConfigPath(".")
viper.AutomaticEnv() // picks up env vars automatically viper.AutomaticEnv() // picks up env vars automatically
@@ -49,11 +58,11 @@ func main() {
halt() halt()
}() }()
ds, err := datastore.New(viper.GetString("DB")) ds, err := datastore.New(viper.GetString(envDB))
if err != nil { if err != nil {
log.WithError(err).Fatalln("Invalid DB url.") log.WithError(err).Fatalln("Invalid DB url.")
} }
mqType, err := mqs.New(viper.GetString("MQ")) mqType, err := mqs.New(viper.GetString(envMQ))
if err != nil { if err != nil {
log.WithError(err).Fatal("Error on init MQ") log.WithError(err).Fatal("Error on init MQ")
} }
@@ -64,12 +73,12 @@ func main() {
log.WithError(err).Fatalln("Failed to create a runner") log.WithError(err).Fatalln("Failed to create a runner")
} }
tasksURL, port, nasync := viper.GetString("tasks_url"), viper.GetString("port"), viper.GetInt("nasync") apiURL, port, numAsync := viper.GetString(envAPIURL), viper.GetString(envPort), viper.GetInt(envNumAsync)
log.Info("async workers:", nasync) log.Info("async workers:", numAsync)
var wgAsync sync.WaitGroup var wgAsync sync.WaitGroup
if nasync > 0 { if numAsync > 0 {
wgAsync.Add(1) wgAsync.Add(1)
go runner.RunAsyncRunner(ctx, &wgAsync, tasksURL, port, nasync) go runner.RunAsyncRunner(ctx, &wgAsync, apiURL, port, numAsync)
} }
srv := server.New(ds, mqType, rnr) srv := server.New(ds, mqType, rnr)