From 055b10405ea02fb7adb3867141dc56464fda9a90 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 18 Dec 2017 22:23:11 -0500 Subject: use contexts for logging --- nslcd_server/func_handlerequest.go.gen | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'nslcd_server/func_handlerequest.go.gen') diff --git a/nslcd_server/func_handlerequest.go.gen b/nslcd_server/func_handlerequest.go.gen index 750a7b0..8abfb01 100755 --- a/nslcd_server/func_handlerequest.go.gen +++ b/nslcd_server/func_handlerequest.go.gen @@ -28,7 +28,6 @@ import ( "context" "fmt" "io" - "os" "time" p "git.lukeshu.com/go/libnslcd/nslcd_proto" @@ -109,6 +108,8 @@ func HandleRequest(backend Backend, limits Limits, conn Conn, ctx context.Contex } } + log := LoggerFromContext(ctx) + var in io.Reader = conn if limits.RequestMaxSize > 0 { in = &io.LimitedReader{R: in, N: limits.RequestMaxSize} @@ -135,7 +136,7 @@ while read -r request; do PAM_Authentication) echo '_req := req' echo '_req.Password = sensitive' - echo 'fmt.Fprintf(os.Stderr, "Request: %#v\n", _req)' + echo 'log.Info(fmt.Sprintf("Request: %#v\n", _req))' ;; PAM_PwMod) echo '_req := req' @@ -143,15 +144,15 @@ while read -r request; do echo ' _req.OldPassword = sensitive' echo '}' echo '_req.NewPassword = sensitive' - echo 'fmt.Fprintf(os.Stderr, "Request: %#v\n", _req)' + echo 'log.Info(fmt.Sprintf("Request: %#v", _req))' ;; PAM_UserMod) echo '_req := req' echo '_req.Password = sensitive' - echo 'fmt.Fprintf(os.Stderr, "Request: %#v\n", _req)' + echo 'log.Info(fmt.Sprintf("Request: %#v", _req))' ;; *) - echo 'fmt.Fprintf(os.Stderr, "Request: %#v\n", req)' + echo 'log.Info(fmt.Sprintf("Request: %#v", req))' ;; esac ) -- cgit v1.2.3