Adjust to new logging API

vkuznet · vkuznet · commit c6689b9b7617 · 2021-07-30T07:56:17.000-04:00
diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/vkuznet/TokenManager v0.0.1 // indirect
 	github.com/vkuznet/auth-proxy-server/auth v0.0.0-20210726200103-cffa690dda9b
 	github.com/vkuznet/auth-proxy-server/cric v0.0.0-20210726200103-cffa690dda9b
-	github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210729183901-75d8831dd7bb
+	github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210730112749-785f5559039f
 	golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670
 	golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
diff --git a/go.sum b/go.sum
@@ -157,8 +157,8 @@ github.com/vkuznet/auth-proxy-server/auth v0.0.0-20210726200103-cffa690dda9b h1:
 github.com/vkuznet/auth-proxy-server/auth v0.0.0-20210726200103-cffa690dda9b/go.mod h1:4o7LB5cxgJ8Mb7RIZ46D4wrxAuZGCWGHq4e/+RnXKhA=
 github.com/vkuznet/auth-proxy-server/cric v0.0.0-20210726200103-cffa690dda9b h1:hpnaGzGXac0Ft3nIXV7575N21ReFs0C5vDKkUs9CqEQ=
 github.com/vkuznet/auth-proxy-server/cric v0.0.0-20210726200103-cffa690dda9b/go.mod h1:OvroOpAhAEBJYwdisIrMKAK5WQxr2tR1ncFGqRcWo0s=
-github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210729183901-75d8831dd7bb h1:XbvJ7t15jUi0ObhJ4SYzQDdeLvvx+TMlzlqzA2ISdPQ=
-github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210729183901-75d8831dd7bb/go.mod h1:rEHBafUXWUWp8o4zkvTooUDTHDhV4oj4trnO1fI2l4k=
+github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210730112749-785f5559039f h1:Vssoux4/lQTLRwdLYkZLHdZEPTREFTwIzEkEFMHLfaU=
+github.com/vkuznet/auth-proxy-server/logging v0.0.0-20210730112749-785f5559039f/go.mod h1:rEHBafUXWUWp8o4zkvTooUDTHDhV4oj4trnO1fI2l4k=
 github.com/vkuznet/x509proxy v0.0.0-20191014143623-163039704c67 h1:7s/FGCnCgfaJxmyeE+k18s5Bpx1TIrss4sMesjqRJsI=
 github.com/vkuznet/x509proxy v0.0.0-20191014143623-163039704c67/go.mod h1:n8gnqWgHpPWW+DyA66Zam8qQshAmDxVVmSmObyR6M8g=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/main.go b/main.go
@@ -329,6 +329,10 @@ func main() {
 			log.SetOutput(rotlogs)
 		}
 	}
+	// initialize logging module
+	logging.CMSMonitType = Config.MonitType
+	logging.CMSMonitProducer = Config.MonitProducer
+
 	if Config.Verbose > 0 {
 		log.Printf("%+v\n", Config)
 	}
@@ -350,6 +354,7 @@ func main() {
 	// initialize all particiapted providers
 	auth.Init(Config.Providers, Config.Verbose)
 
+	// initialize cmsauth module
 	CMSAuth.Init(Config.Hmac)
 
 	// start our servers
diff --git a/oauth.go b/oauth.go
@@ -362,7 +362,7 @@ func oauthRequestHandler(w http.ResponseWriter, r *http.Request) {
 
 	attrs, err := checkAccessToken(r)
 	// add LogRequest after we set cms headers in HTTP request
-	defer logging.LogRequest(w, r, start, "CERN-SSO-OAuth2-OICD", &status, tstamp)
+	defer logging.LogRequest(w, r, start, "CERN-SSO-OAuth2-OICD", &status, tstamp, 0)
 	if err != nil {
 		// there is no proper authentication yet, redirect users to auth callback
 		aurl := OAuth2Config.AuthCodeURL(oauthState)
diff --git a/scitokens.go b/scitokens.go
@@ -162,7 +162,7 @@ func scitokensHandler(w http.ResponseWriter, r *http.Request) {
 	start := time.Now()
 	status := http.StatusOK
 	tstamp := int64(start.UnixNano() / 1000000) // use milliseconds for MONIT
-	defer logging.LogRequest(w, r, start, "scitokens", &status, tstamp)
+	defer logging.LogRequest(w, r, start, "scitokens", &status, tstamp, 0)
 
 	err := r.ParseForm()
 	if err != nil {
diff --git a/x509.go b/x509.go
@@ -55,7 +55,7 @@ func x509RequestHandler(w http.ResponseWriter, r *http.Request) {
 		printHTTPRequest(r, "cms headers")
 	}
 	// add LogRequest after we set cms headers in HTTP request
-	defer logging.LogRequest(w, r, start, "x509", &status, tstamp)
+	defer logging.LogRequest(w, r, start, "x509", &status, tstamp, 0)
 	if _, ok := userData["name"]; !ok {
 		log.Println("unauthorized access, user not found in CRIC DB")
 		status = http.StatusUnauthorized

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,10 @@ func main() {`
`329`	`329`	`log.SetOutput(rotlogs)`
`330`	`330`	`}`
`331`	`331`	`}`
	`332`	`+ // initialize logging module`
	`333`	`+ logging.CMSMonitType = Config.MonitType`
	`334`	`+ logging.CMSMonitProducer = Config.MonitProducer`
	`335`	`+`
`332`	`336`	`if Config.Verbose > 0 {`
`333`	`337`	`log.Printf("%+v\n", Config)`
`334`	`338`	`}`
`@@ -350,6 +354,7 @@ func main() {`
`350`	`354`	`// initialize all particiapted providers`
`351`	`355`	`auth.Init(Config.Providers, Config.Verbose)`
`352`	`356`
	`357`	`+ // initialize cmsauth module`
`353`	`358`	`CMSAuth.Init(Config.Hmac)`
`354`	`359`
`355`	`360`	`// start our servers`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func x509RequestHandler(w http.ResponseWriter, r *http.Request) {`
`55`	`55`	`printHTTPRequest(r, "cms headers")`
`56`	`56`	`}`
`57`	`57`	`// add LogRequest after we set cms headers in HTTP request`
`58`		`- defer logging.LogRequest(w, r, start, "x509", &status, tstamp)`
	`58`	`+ defer logging.LogRequest(w, r, start, "x509", &status, tstamp, 0)`
`59`	`59`	`if _, ok := userData["name"]; !ok {`
`60`	`60`	`log.Println("unauthorized access, user not found in CRIC DB")`
`61`	`61`	`status = http.StatusUnauthorized`