Commit 169f08c7 authored by Simon Pastor's avatar Simon Pastor
Browse files

using go-packages log

parent 561f7ab1

go-apps/meep-ctrl-engine/go.mod

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-ctrl-engine 
go 1.12



require (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-watchdog v0.0.0

	github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db // indirect

	github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351
@@ -27,7 +28,6 @@ require ( 
	github.com/onsi/gomega v1.5.0 // indirect

	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect

	github.com/pkg/errors v0.8.1 // indirect

	github.com/sirupsen/logrus v1.4.1

	github.com/spf13/pflag v1.0.3 // indirect

	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect

	gopkg.in/inf.v0 v0.9.1 // indirect

go-apps/meep-ctrl-engine/log/meeplog.go

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019

 * InterDigital Communications, Inc.

 * All rights reserved.

 *

 * The information provided herein is the proprietary and confidential

 * information of InterDigital Communications, Inc.

 */



package logmain



import (

	log "github.com/sirupsen/logrus"

)



func MeepJSONLogInit() {

	log.SetFormatter(&log.JSONFormatter{})

	log.SetLevel(log.DebugLevel)

}



func Info(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Info(args...)

}



func Debug(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Debug(args...)

}



func Warn(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Warn(args...)

}

func Error(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Error(args...)

}

func Panic(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Panic(args...)

}



func Fatal(args ...interface{}) {

	log.WithFields(log.Fields{

		"meep.component": "ctrl-engine",

	}).Fatal(args...)

}



func WithFields(fields log.Fields) *log.Entry {

	return log.WithFields(fields)

}

go-apps/meep-ctrl-engine/main.go

+3 −2
Original line number Diff line number Diff line
@@ -16,14 +16,15 @@ import ( 
	"syscall"

	"time"



	log "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-ctrl-engine/log"

	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"



	server "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-ctrl-engine/server"



	"github.com/gorilla/handlers"

)



func init() {

	log.MeepJSONLogInit()

	log.MeepJSONLogInit("meep-ctrl-engine")

}



func main() {

go-apps/meep-ctrl-engine/main_test.go

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import ( 
	"strings"

	"testing"



	log "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-ctrl-engine/log"

	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)



// Build:

go-apps/meep-ctrl-engine/server/ctrl-engine.go

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ import ( 
	_ "github.com/go-kivik/couchdb"

	"github.com/gorilla/mux"



	log "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-ctrl-engine/log"

	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

	watchdog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-watchdog"

	logrus "github.com/sirupsen/logrus"

)



const scenarioDBName = "scenarios"
@@ -850,7 +849,7 @@ func sendEventUeMobility(event Event) (string, int) { 
			return err.Error(), http.StatusNotFound

		}

		log.Debug("Active scenario updated with rev: ", rev)

		log.WithFields(logrus.Fields{

		log.WithFields(log.Fields{

			"meep.log.component": "ctrl-engine",

			"meep.log.msgType":   "mobilityEvent",

			"meep.log.oldPoa":    oldNL.Name,