rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00
Code Issues Releases Wiki Activity

Refactor how consoles and engines are loaded

Browse Source
This commit is contained in:
Josh Curl
2016-09-15 16:12:15 -07:00
parent 5987d713a4
commit cf998978a8
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/control/engine.go
View File

@@ -10,7 +10,6 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
@@ -68,9 +67,7 @@ func engineSwitch(c *cli.Context) error {
log.Fatal(err)
}
project.ServiceConfigs.Add("docker", &composeConfig.ServiceConfig{})
if err = compose.LoadService(project, cfg, true, newEngine); err != nil {
if err = compose.LoadSpecialService(project, cfg, "docker", newEngine); err != nil {
log.Fatal(err)
}

5
cmd/switchconsole/switch_console.go
View File

@@ -4,7 +4,6 @@ import (
"os"
log "github.com/Sirupsen/logrus"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
@@ -25,9 +24,7 @@ func Main() {
}
if newConsole != "default" {
project.ServiceConfigs.Add("console", &composeConfig.ServiceConfig{})
if err = compose.LoadService(project, cfg, true, newConsole); err != nil {
if err = compose.LoadSpecialService(project, cfg, "console", newConsole); err != nil {
log.Fatal(err)
}
}

48
compose/reload.go
View File

@@ -37,6 +37,37 @@ func LoadService(p *project.Project, cfg *config.CloudConfig, useNetwork bool, s
return nil
}
func LoadSpecialService(p *project.Project, cfg *config.CloudConfig, serviceName, serviceValue string) error {
// Save config in case load fails
previousConfig, ok := p.ServiceConfigs.Get(serviceName)
p.ServiceConfigs.Add(serviceName, &composeConfig.ServiceConfig{})
if err := LoadService(p, cfg, true, serviceValue); err != nil {
// Rollback to previous config
if ok {
p.ServiceConfigs.Add(serviceName, previousConfig)
}
return err
}
return nil
}
func loadConsoleService(cfg *config.CloudConfig, p *project.Project) error {
if cfg.Rancher.Console == "" || cfg.Rancher.Console == "default" {
return nil
}
return LoadSpecialService(p, cfg, "console", cfg.Rancher.Console)
}
func loadEngineService(cfg *config.CloudConfig, p *project.Project) error {
if cfg.Rancher.Docker.Engine == "" || cfg.Rancher.Docker.Engine == cfg.Rancher.Defaults.Docker.Engine {
return nil
}
return LoadSpecialService(p, cfg, "docker", cfg.Rancher.Docker.Engine)
}
func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, environmentLookup *docker.ConfigEnvironment, authLookup *docker.ConfigAuthLookup) func() error {
enabled := map[interface{}]interface{}{}
return func() error {
@@ -62,17 +93,18 @@ func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, envir
enabled[service] = service
}
if loadConsole && cfg.Rancher.Console != "" && cfg.Rancher.Console != "default" {
if err := LoadService(p, cfg, *useNetwork, cfg.Rancher.Console); err != nil && err != network.ErrNoNetwork {
log.Error(err)
if !*useNetwork {
return nil
}
if loadConsole {
if err := loadConsoleService(cfg, p); err != nil {
log.Errorf("Failed to load console: %v", err)
}
}
if cfg.Rancher.Docker.Engine != "" && cfg.Rancher.Docker.Engine != cfg.Rancher.Defaults.Docker.Engine {
p.ServiceConfigs.Add("docker", &composeConfig.ServiceConfig{})
if err := LoadService(p, cfg, *useNetwork, cfg.Rancher.Docker.Engine); err != nil && err != network.ErrNoNetwork {
log.Error(err)
}
if err := loadEngineService(cfg, p); err != nil {
log.Errorf("Failed to load engine: %v", err)
}
return nil