api: Change logger functions to accept a log entry

Rather than accepting a `logrus.FieldLogger` interface type, change all
the `SetLogger()` functions to accept a `logrus.Entry`.

Signed-off-by: James O. D. Hunt <[email protected]>

virtcontainers/api.go

@@ -19,11 +19,12 @@ func init() {
 	runtime.LockOSThread()
 }
 
-var virtLog = logrus.FieldLogger(logrus.New())
+var virtLog *logrus.Entry
 
 // SetLogger sets the logger for virtcontainers package.
-func SetLogger(logger logrus.FieldLogger) {
+func SetLogger(logger *logrus.Entry) {
 	virtLog = logger.WithField("source", "virtcontainers")
+
 	deviceApi.SetLogger(virtLog)
 }
 

virtcontainers/device/api/interface.go

@@ -12,10 +12,10 @@ import (
 	"github.com/kata-containers/runtime/virtcontainers/device/config"
 )
 
-var devLogger = logrus.FieldLogger(logrus.New())
+var devLogger *logrus.Entry
 
 // SetLogger sets the logger for device api package.
-func SetLogger(logger logrus.FieldLogger) {
+func SetLogger(logger *logrus.Entry) {
 	devLogger = logger
 }
 

virtcontainers/hack/virtc/main.go

@@ -19,7 +19,7 @@ import (
 	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
-var virtcLog = logrus.New()
+var virtcLog *logrus.Entry
 
 var listFormat = "%s\t%s\t%s\t%s\n"
 var statusFormat = "%s\t%s\n"
@@ -915,14 +915,14 @@ func main() {
 			if err != nil {
 				return err
 			}
-			virtcLog.Out = f
+			virtcLog.Logger.Out = f
 		}
 
 		switch context.GlobalString("log-format") {
 		case "text":
 			// retain logrus's default.
 		case "json":
-			virtcLog.Formatter = new(logrus.JSONFormatter)
+			virtcLog.Logger.Formatter = new(logrus.JSONFormatter)
 		default:
 			return fmt.Errorf("unknown log-format %q", context.GlobalString("log-format"))
 		}

virtcontainers/implementation.go

@@ -22,7 +22,7 @@ type VCImpl struct {
 }
 
 // SetLogger implements the VC function of the same name.
-func (impl *VCImpl) SetLogger(logger logrus.FieldLogger) {
+func (impl *VCImpl) SetLogger(logger *logrus.Entry) {
 	SetLogger(logger)
 }
 

virtcontainers/interfaces.go

@@ -15,7 +15,7 @@ import (
 
 // VC is the Virtcontainers interface
 type VC interface {
-	SetLogger(logger logrus.FieldLogger)
+	SetLogger(logger *logrus.Entry)
 	SetFactory(Factory)
 
 	CreateSandbox(sandboxConfig SandboxConfig) (VCSandbox, error)

virtcontainers/pkg/oci/utils.go

@@ -131,7 +131,7 @@ func (config *RuntimeConfig) AddKernelParam(p vc.Param) error {
 var ociLog = logrus.FieldLogger(logrus.New())
 
 // SetLogger sets the logger for oci package.
-func SetLogger(logger logrus.FieldLogger) {
+func SetLogger(logger *logrus.Entry) {
 	ociLog = logger.WithFields(logrus.Fields{
 		"source":    "virtcontainers",
 		"subsystem": "oci",

virtcontainers/pkg/vcmock/mock.go

@@ -29,7 +29,7 @@ import (
 const mockErrorPrefix = "vcmock forced failure"
 
 // SetLogger implements the VC function of the same name.
-func (m *VCMock) SetLogger(logger logrus.FieldLogger) {
+func (m *VCMock) SetLogger(logger *logrus.Entry) {
 	if m.SetLoggerFunc != nil {
 		m.SetLoggerFunc(logger)
 	}

virtcontainers/pkg/vcmock/mock_test.go

@@ -98,7 +98,7 @@ func TestVCMockSetLogger(t *testing.T) {
 	m := &VCMock{}
 	assert.Nil(m.SetLoggerFunc)
 
-	logger := logrus.New()
+	logger := logrus.NewEntry(logrus.New())
 
 	assert.Equal(loggerTriggered, 0)
 	m.SetLogger(logger)

virtcontainers/virtcontainers_test.go

@@ -66,11 +66,11 @@ func TestMain(m *testing.M) {
 
 	flag.Parse()
 
-	logger := logrus.New()
-	logger.Level = logrus.ErrorLevel
+	logger := logrus.NewEntry(logrus.New())
+	logger.Logger.Level = logrus.ErrorLevel
 	for _, arg := range flag.Args() {
 		if arg == "debug-logs" {
-			logger.Level = logrus.DebugLevel
+			logger.Logger.Level = logrus.DebugLevel
 		}
 	}
 	SetLogger(logger)