From 0577135ea968761623a0350640cf20bc7511c157 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Mon, 17 Nov 2014 13:31:56 -0800 Subject: [PATCH] scheduler: Pass the strategy and filters as a creation argument. Signed-off-by: Andrea Luzzardi --- scheduler/scheduler.go | 6 +++--- swarmd/main.go | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index c61b6782d2..4591764df3 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -18,11 +18,11 @@ type Scheduler struct { filters []filter.Filter } -func NewScheduler(cluster *libcluster.Cluster) *Scheduler { +func NewScheduler(cluster *libcluster.Cluster, strategy strategy.PlacementStrategy, filters []filter.Filter) *Scheduler { return &Scheduler{ cluster: cluster, - strategy: &strategy.RandomPlacementStrategy{}, - filters: []filter.Filter{}, + strategy: strategy, + filters: filters, } } diff --git a/swarmd/main.go b/swarmd/main.go index 9ca94fd4ec..6cf164f5a5 100644 --- a/swarmd/main.go +++ b/swarmd/main.go @@ -9,6 +9,8 @@ import ( "github.com/docker/libcluster" "github.com/docker/libcluster/api" "github.com/docker/libcluster/scheduler" + "github.com/docker/libcluster/scheduler/filter" + "github.com/docker/libcluster/scheduler/strategy" ) type logHandler struct { @@ -39,7 +41,9 @@ func main() { log.Fatal(err) } } + c.Events(&logHandler{}) - s := scheduler.NewScheduler(c) + s := scheduler.NewScheduler(c, &strategy.RandomPlacementStrategy{}, []filter.Filter{}) + log.Fatal(api.ListenAndServe(c, s, ":4243")) }