rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-13 14:44:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #273 from wlan0/bugfix4

Browse Source 
throw error when enabled service cannot be loaded
This commit is contained in:
Darren Shepherd 2015-05-11 18:04:11 -07:00
commit 781fe85a3c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/control/service.go
View File

@ -3,9 +3,11 @@ package control
import ( import (
"fmt" "fmt"
"log" "log"
"strings"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/rancherio/os/config" "github.com/rancherio/os/config"
"github.com/rancherio/os/docker"
"github.com/rancherio/os/util" "github.com/rancherio/os/util"
) )
@ -88,6 +90,12 @@ func enable(c *cli.Context) {
for _, service := range c.Args() { for _, service := range c.Args() {
if val, ok := cfg.ServicesInclude[service]; !ok || !val { if val, ok := cfg.ServicesInclude[service]; !ok || !val {
if strings.HasPrefix(service, "/") && !strings.HasPrefix(service, "/var/lib/rancher/conf") {
log.Fatalf("ERROR: Service should be in path /var/lib/rancher/conf")
}
if _, err := docker.LoadServiceResource(service, true, cfg); err != nil {
log.Fatalf("could not load service %s", service)
}
cfg.ServicesInclude[service] = true cfg.ServicesInclude[service] = true
changed = true changed = true
} }