Unverified Commit 3d89b1b2 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #60 from pastorsx/sp_dev_logs 

logs optimizations
parents 503b47dc e695807f

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import ( 
)



func init() {

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

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

}



func main() {

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

+6 −6
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
package server



import (

	"log"

	"net/http"

	"time"



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

)



func Logger(inner http.Handler, name string) http.Handler {
@@ -36,11 +37,10 @@ func Logger(inner http.Handler, name string) http.Handler { 


		inner.ServeHTTP(w, r)



		log.Printf(

			"%s %s %s %s",

			r.Method,

			r.RequestURI,

			name,

		log.Debug(

			r.Method, " ",

			r.RequestURI, " ",

			name, " ",

			time.Since(start),

		)

	})

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

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ type Routes []Route 
func NewRouter() *mux.Router {

	router := mux.NewRouter().StrictSlash(true)

	for _, route := range routes {

		var handler http.Handler = route.HandlerFunc

		//		handler = Logger(handler, route.Name)

		var handler http.Handler = Logger(route.HandlerFunc, route.Name)



		router.

			Methods(route.Method).

go-apps/meep-loc-serv/sbi/loc-serv-sbi.go

+2 −3
Original line number Diff line number Diff line
@@ -76,11 +76,10 @@ func eventHandler(channel string, payload string) { 


	// MEEP Ctrl Engine active scenario update Channel

	case mod.ActiveScenarioEvents:

		log.Debug("Event received on channel: ", mod.ActiveScenarioEvents)

		log.Debug("Event received on channel: ", mod.ActiveScenarioEvents, " payload: ", payload)

		processActiveScenarioUpdate()



	default:

		log.Warn("Unsupported channel")

		log.Warn("Unsupported channel", " payload: ", payload)

	}

}

go-apps/meep-loc-serv/server/logger.go

+6 −6
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
package server



import (

	"log"

	"net/http"

	"time"



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

)



func Logger(inner http.Handler, name string) http.Handler {
@@ -36,11 +37,10 @@ func Logger(inner http.Handler, name string) http.Handler { 


		inner.ServeHTTP(w, r)



		log.Printf(

			"%s %s %s %s",

			r.Method,

			r.RequestURI,

			name,

		log.Debug(

			r.Method, " ",

			r.RequestURI, " ",

			name, " ",

			time.Since(start),

		)

	})