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

Fix configuration load from environment variables (#123)

Browse Source 
Fix configuration load from environment variables
Fixed #119
This commit is contained in:
C Cirello
2016-10-05 19:10:21 +02:00
committed by Seif Lotfy سيف لطفي
parent 659d30dd9f
commit eed5422c59
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/runner/async_runner.go
View File

@@ -100,7 +100,7 @@ func RunAsyncRunner(tasksrv, port string) {
for { for {
task, err := getTask(u) task, err := getTask(u)
if err != nil { if err != nil {
log.WithError(err) log.WithError(err).Info("Cannot get task")
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
continue continue
} }

12
main.go
View File

@@ -24,8 +24,8 @@ func init() {
viper.SetDefault("mq", fmt.Sprintf("bolt://%s/data/worker_mq.db", cwd)) viper.SetDefault("mq", fmt.Sprintf("bolt://%s/data/worker_mq.db", cwd))
viper.SetDefault("db", fmt.Sprintf("bolt://%s/data/bolt.db?bucket=funcs", cwd)) viper.SetDefault("db", fmt.Sprintf("bolt://%s/data/bolt.db?bucket=funcs", cwd))
viper.SetDefault("port", 8080) viper.SetDefault("port", 8080)
viper.SetDefault("tasksrv", fmt.Sprintf("http://localhost:%d", viper.GetInt("port"))) viper.SetDefault("tasks_url", fmt.Sprintf("http://localhost:%d", viper.GetInt("port")))
viper.SetDefault("NASYNC", 1) viper.SetDefault("nasync", 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
@@ -55,9 +55,11 @@ func main() {
log.WithError(err).Fatalln("Failed to create a runner") log.WithError(err).Fatalln("Failed to create a runner")
} }
tasksrv, port := viper.GetString("PORT"), viper.GetString("TASKSVR") tasksURL, port, nasync := viper.GetString("tasks_url"), viper.GetString("port"), viper.GetInt("nasync")
for nasync, i := viper.GetInt("NASYNC"), 0; i < nasync; i++ { log.Info("async workers:", nasync)
go runner.RunAsyncRunner(tasksrv, port) log.Fatal(tasksURL)
for i := 0; i < nasync; i++ {
go runner.RunAsyncRunner(tasksURL, port)
} }
srv := server.New(ds, mqType, rnr) srv := server.New(ds, mqType, rnr)