rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

make ros log to dmesg

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2016-11-23 20:49:35 +10:00
parent 2e03f1b706
commit 4df962d4b6
69 changed files with 691 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/service.go
View File

@@ -3,7 +3,6 @@ package docker
import (
"fmt"
"github.com/Sirupsen/logrus"
dockerclient "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
composeConfig "github.com/docker/libcompose/config"
@@ -11,6 +10,7 @@ import (
"github.com/docker/libcompose/project"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/config"
"github.com/rancher/os/log"
"golang.org/x/net/context"
)
@@ -96,7 +96,7 @@ func (s *Service) shouldRebuild(ctx context.Context) (bool, error) {
origRebuildLabel := containerInfo.Config.Labels[config.RebuildLabel]
newRebuildLabel := s.Config().Labels[config.RebuildLabel]
rebuildLabelChanged := newRebuildLabel != origRebuildLabel
logrus.WithFields(logrus.Fields{
log.WithFields(log.Fields{
"origRebuildLabel": origRebuildLabel,
"newRebuildLabel": newRebuildLabel,
"rebuildLabelChanged": rebuildLabelChanged,
@@ -121,7 +121,7 @@ func (s *Service) shouldRebuild(ctx context.Context) (bool, error) {
} else if rebuildLabelChanged || origRebuildLabel != "false" {
return true, nil
} else {
logrus.Warnf("%s needs rebuilding", name)
log.Warnf("%s needs rebuilding", name)
}
}
}
@@ -140,7 +140,7 @@ func (s *Service) Up(ctx context.Context, options options.Up) error {
return err
}
if shouldRebuild {
logrus.Infof("Rebuilding %s", s.Name())
log.Infof("Rebuilding %s", s.Name())
cs, err := s.Service.Containers(ctx)
if err != nil {
return err
@@ -221,7 +221,7 @@ func (s *Service) rename(ctx context.Context) error {
}
if len(info.Name) > 0 && info.Name[1:] != s.Name() {
logrus.Debugf("Renaming container %s => %s", info.Name[1:], s.Name())
log.Debugf("Renaming container %s => %s", info.Name[1:], s.Name())
return client.ContainerRename(context.Background(), info.ID, s.Name())
}
return nil