1
0
Fork 0
This commit is contained in:
Gregory Eremin 2015-02-11 20:57:25 +07:00
parent 7f552e5c8a
commit d991f1abb5
6 changed files with 65 additions and 47 deletions

31
app.go
View File

@ -1,31 +0,0 @@
package main
import (
"flag"
"github.com/kr/pretty"
"github.com/localhots/confection"
"github.com/localhots/yeast/chain"
"github.com/localhots/yeast/core"
"github.com/localhots/yeast/unit"
)
func init() {
confection.SetupFlags()
flag.Parse()
}
func main() {
core.InitConfig()
ub := unit.NewBank(core.Conf().UnitsConfig)
ub.Reload()
cb := chain.NewBank(core.Conf().ChainsConfig, ub)
cb.Reload()
pretty.Println(core.Conf())
println("Waiting")
select {}
}

View File

@ -32,6 +32,8 @@ func (b *Bank) Chain(name string) *Chain {
} }
func (b *Bank) Reload() { func (b *Bank) Reload() {
b.units.Reload()
f, err := os.Open(b.config) f, err := os.Open(b.config)
if err != nil { if err != nil {
panic("Failed to open chains config: " + b.config) panic("Failed to open chains config: " + b.config)

30
core/app.go Normal file
View File

@ -0,0 +1,30 @@
package core
import (
"github.com/localhots/yeast/chain"
"github.com/localhots/yeast/unit"
)
type (
App struct {
config *Config
chains *chain.Bank
}
)
func NewApp() *App {
a := &App{
config: &Config{},
}
a.config.Init()
ub := unit.NewBank(a.Conf().UnitsConfig)
a.chains = chain.NewBank(a.Conf().ChainsConfig, ub)
a.chains.Reload()
return a
}
func (a *App) Conf() Config {
return a.config.conf.Config().(Config)
}

View File

@ -8,6 +8,7 @@ import (
type ( type (
Config struct { Config struct {
conf *confection.Manager
ChainsConfig string `json:"chains_config_path" attrs:"required" title:"Chains config path"` ChainsConfig string `json:"chains_config_path" attrs:"required" title:"Chains config path"`
UnitsConfig string `json:"units_config_path" attrs:"required" title:"Units config path"` UnitsConfig string `json:"units_config_path" attrs:"required" title:"Units config path"`
Python Python `json:"python" title:"Python"` Python Python `json:"python" title:"Python"`
@ -18,21 +19,13 @@ type (
} }
) )
var ( func (c *Config) Init() {
conf *confection.Manager c.conf = confection.New(*c, c.decoder)
) go c.conf.StartServer()
c.conf.RequireConfig()
func Conf() Config {
return conf.Config().(Config)
} }
func InitConfig() { func (c *Config) decoder(b []byte) interface{} {
conf = confection.New(Config{}, ConfigDecoder)
go conf.StartServer()
conf.RequireConfig()
}
func ConfigDecoder(b []byte) interface{} {
var newConf Config var newConf Config
if err := json.Unmarshal(b, &newConf); err != nil { if err := json.Unmarshal(b, &newConf); err != nil {
panic(err) panic(err)

View File

@ -8,7 +8,10 @@ import (
) )
type ( type (
Supervisor struct{} Supervisor struct {
pythonBin string
pythonWrapper string
}
) )
// XXX: We're about to spawn hundreds of Python processes // XXX: We're about to spawn hundreds of Python processes
@ -21,8 +24,7 @@ func (s *Supervisor) StartAll(units []string) {
func (s *Supervisor) Start(name string) { func (s *Supervisor) Start(name string) {
fmt.Println("Starting unit: " + name) fmt.Println("Starting unit: " + name)
conf := Conf().Python cmd := exec.Command(s.pythonBin, s.pythonWrapper, name)
cmd := exec.Command(conf.BinPath, conf.WrapperPath, name)
cmd.Stdout = os.Stdout // Sorry cmd.Stdout = os.Stdout // Sorry
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
fmt.Println("Failed to start unit: ", name) fmt.Println("Failed to start unit: ", name)

22
yeast.go Normal file
View File

@ -0,0 +1,22 @@
package main
import (
"flag"
"github.com/kr/pretty"
"github.com/localhots/confection"
"github.com/localhots/yeast/core"
)
func init() {
confection.SetupFlags()
flag.Parse()
}
func main() {
app := core.NewApp()
pretty.Println(app.Conf())
println("Waiting")
select {}
}