Commit a61df600 authored by Simon Pastor's avatar Simon Pastor
Browse files

httplogger as a package for all services

parent 6c9ff158

.meepctl-repocfg.yaml

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ repo: 
    meep-logger:

      src: go-packages/meep-logger

      lint: true

    meep-http-logger:

      src: go-packages/meep-http-logger

      lint: true

    meep-metric-store:

      src: go-packages/meep-metric-store

      lint: true

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

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ go 1.12 
require (

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

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-ctrl-engine-model v0.0.0

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

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

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

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0
@@ -19,6 +20,7 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-couch => ../../go-packages/meep-couch

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-ctrl-engine-client => ../../go-packages/meep-ctrl-engine-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-ctrl-engine-model => ../../go-packages/meep-ctrl-engine-model

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger => ../../go-packages/meep-http-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metric-store => ../../go-packages/meep-metric-store

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model

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

+1 −0
Original line number Diff line number Diff line 
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

github.com/InterDigitalInc/AdvantEDGE v1.4.0 h1:MnzK3dl4hUvfhZ4wYarVmJzE5IMO2Q63dyDkcQtEv1Q=

github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM=

github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y=

github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM=

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

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import ( 


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

	ceModel "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-ctrl-engine-model"

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

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

	ms "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metric-store"

	mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model"
@@ -413,6 +414,8 @@ func ceActivateScenario(w http.ResponseWriter, r *http.Request) { 
		return

	}



	_ = httpLog.ReInit(moduleName, scenarioName)



	// Activate scenario & publish

	err = activeModel.SetScenario(scenario)

	if err != nil {

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

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import ( 
	"net/http"

	"strings"



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



	"github.com/gorilla/mux"

)
@@ -46,7 +48,9 @@ func NewRouter() *mux.Router { 


	// subrouter := router.PathPrefix("/ctrl-engine/").Subrouter()

	for _, route := range routes {

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

		var handler http.Handler = route.HandlerFunc

		handler = Logger(handler, route.Name)

		handler = httpLog.LogRx(handler, "")



		router.

			Methods(route.Method).