summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDashie <dashie@sigpipe.me>2018-06-13 11:25:53 +0200
committerDashie <dashie@sigpipe.me>2018-06-13 11:25:53 +0200
commited8e09755bd818e4a8f1f1b4b85c85b294db2b7a (patch)
tree26cf7ef1c3481ec6f8a402514b7ba915f60e4be9
parentbb29322b053f9607b9e5727638ff3f4e2ede6018 (diff)
Okay this seems to fix thingsgo
-rw-r--r--TODO5
-rw-r--r--cmd/worker.go2
-rw-r--r--setting/setting.go2
-rw-r--r--workers/workers.go5
4 files changed, 6 insertions, 8 deletions
diff --git a/TODO b/TODO
index bff5d6de..24b419f4 100644
--- a/TODO
+++ b/TODO
@@ -27,7 +27,4 @@ Wavesurfer-js
issue with partial content, doesn't works, or after some minutes !
Workers issue
-after taks run:
-127.0.0.1:6379[4]> keys *
-1) "task_31f19bea-e7e1-4887-9ea8-4f26e7b08af3"
--> shouldn't the task_ be removed after running ?
+ must not use the same redis DB for worker and results
diff --git a/cmd/worker.go b/cmd/worker.go
index 5d046bd4..411b1252 100644
--- a/cmd/worker.go
+++ b/cmd/worker.go
@@ -51,7 +51,7 @@ func runWorker(ctx *cli.Context) error {
return err
}
- worker := server.NewWorker("transcoding_infos", 1)
+ worker := server.NewWorker("transcoding_infos", 4)
err = worker.Launch()
if err != nil {
log.Errorf("Launching worker transcoding_infos error: %s", err)
diff --git a/setting/setting.go b/setting/setting.go
index b417a36b..72b0bbf0 100644
--- a/setting/setting.go
+++ b/setting/setting.go
@@ -59,7 +59,7 @@ var (
// Worker configuration
Worker struct {
RedisHost string
- RedisDb string
+ RedisDb int
RedisPort string
}
diff --git a/workers/workers.go b/workers/workers.go
index 5a2ec8e3..1333b0e2 100644
--- a/workers/workers.go
+++ b/workers/workers.go
@@ -12,9 +12,10 @@ import (
// CreateServer initiate the machinery server
func CreateServer() (*machinery.Server, error) {
cnf := config.Config{
- Broker: fmt.Sprintf("redis://%s:%s/%s", setting.Worker.RedisHost, setting.Worker.RedisPort, setting.Worker.RedisDb),
- ResultBackend: fmt.Sprintf("redis://%s:%s/%s", setting.Worker.RedisHost, setting.Worker.RedisPort, setting.Worker.RedisDb),
+ Broker: fmt.Sprintf("redis://%s:%s/%d", setting.Worker.RedisHost, setting.Worker.RedisPort, setting.Worker.RedisDb),
+ ResultBackend: fmt.Sprintf("redis://%s:%s/%d", setting.Worker.RedisHost, setting.Worker.RedisPort, setting.Worker.RedisDb + 1),
DefaultQueue: "reel2bits_queue",
+ ResultsExpireIn: 60,
}
mlog.Set(log.StandardLogger())