From 655deb617f701ff586a596e9916c8eaaec77ebee Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 12 Feb 2015 03:09:35 +0700 Subject: [PATCH] App don't know about units --- chain/bank.go | 6 +++--- core/app.go | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/chain/bank.go b/chain/bank.go index c418c06..4b9b83f 100644 --- a/chain/bank.go +++ b/chain/bank.go @@ -18,11 +18,11 @@ type ( } ) -func NewBank(config string, units *unit.Bank) *Bank { +func NewBank(chainsConfig, unitsConfig string) *Bank { return &Bank{ - config: config, + config: chainsConfig, chains: map[string]*Chain{}, - units: units, + units: unit.NewBank(unitsConfig), } } diff --git a/core/app.go b/core/app.go index 93f2d24..307419d 100644 --- a/core/app.go +++ b/core/app.go @@ -8,7 +8,6 @@ import ( "syscall" "github.com/localhots/yeast/chain" - "github.com/localhots/yeast/unit" ) type ( @@ -23,10 +22,9 @@ func NewApp() *App { conf := &Config{} conf.Init() - ub := unit.NewBank(conf.C().UnitsConfig) a := &App{ config: conf, - chains: chain.NewBank(conf.C().ChainsConfig, ub), + chains: chain.NewBank(conf.C().ChainsConfig, conf.C().UnitsConfig), sv: NewSupervisor(conf.C().Python.BinPath, conf.C().Python.WrapperPath), } a.chains.Reload()