From f02ec8a967a21103a75969b17cf850127ea072c4 Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Fri, 20 May 2016 15:51:52 -0700 Subject: [PATCH] Downgrade failure to rgeister runtime factory to warning It is not an error to fail to register the Docker factory on a system running only rkt, and vice-versa, so these failures are downgraded from an Error to a Warning. The raw handler should always be registered. --- manager/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manager/manager.go b/manager/manager.go index 7cf7d43b..eb9c6098 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -232,12 +232,12 @@ type manager struct { func (self *manager) Start() error { err := docker.Register(self, self.fsInfo, self.ignoreMetrics) if err != nil { - glog.Errorf("Docker container factory registration failed: %v.", err) + glog.Warningf("Docker container factory registration failed: %v.", err) } err = rkt.Register(self, self.fsInfo, self.ignoreMetrics) if err != nil { - glog.Errorf("Registration of the rkt container factory failed: %v", err) + glog.Warningf("Registration of the rkt container factory failed: %v", err) } else { watcher, err := rktwatcher.NewRktContainerWatcher() if err != nil { @@ -248,7 +248,7 @@ func (self *manager) Start() error { err = systemd.Register(self, self.fsInfo, self.ignoreMetrics) if err != nil { - glog.Errorf("Registration of the systemd container factory failed: %v", err) + glog.Warningf("Registration of the systemd container factory failed: %v", err) } err = raw.Register(self, self.fsInfo, self.ignoreMetrics)