Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package prod | 5 package prod |
| 6 | 6 |
| 7 import ( | 7 import ( |
| 8 "fmt" | 8 "fmt" |
| 9 | 9 |
| 10 "github.com/luci/luci-go/common/logging" | 10 "github.com/luci/luci-go/common/logging" |
| 11 "golang.org/x/net/context" | 11 "golang.org/x/net/context" |
| 12 "google.golang.org/appengine/log" | 12 "google.golang.org/appengine/log" |
| 13 ) | 13 ) |
| 14 | 14 |
| 15 // useLogging adds a logging.Logger implementation to the context which logs to | 15 // useLogging adds a logging.Logger implementation to the context which logs to |
| 16 // appengine's log handler. | 16 // appengine's log handler. |
| 17 func useLogging(c context.Context) context.Context { | 17 func useLogging(c context.Context) context.Context { |
| 18 return logging.SetFactory(c, func(ic context.Context) logging.Logger { | 18 return logging.SetFactory(c, func(ic context.Context) logging.Logger { |
| 19 return &loggerImpl{AEContext(ic), ic} | 19 return &loggerImpl{AEContext(ic), ic} |
| 20 }) | 20 }) |
| 21 } | 21 } |
| 22 | 22 |
| 23 type loggerImpl struct { | 23 type loggerImpl struct { |
| 24 aeCtx context.Context | 24 aeCtx context.Context |
| 25 ic context.Context | 25 ic context.Context |
|
estaab
2015/12/23 16:50:46
what does the i in ic stand for?
| |
| 26 } | 26 } |
| 27 | 27 |
| 28 func (gl *loggerImpl) Debugf(format string, args ...interface{}) { | 28 func (gl *loggerImpl) Debugf(format string, args ...interface{}) { |
| 29 gl.LogCall(logging.Debug, 1, format, args) | 29 gl.LogCall(logging.Debug, 1, format, args) |
| 30 } | 30 } |
| 31 func (gl *loggerImpl) Infof(format string, args ...interface{}) { | 31 func (gl *loggerImpl) Infof(format string, args ...interface{}) { |
| 32 gl.LogCall(logging.Info, 1, format, args) | 32 gl.LogCall(logging.Info, 1, format, args) |
| 33 } | 33 } |
| 34 func (gl *loggerImpl) Warningf(format string, args ...interface{}) { | 34 func (gl *loggerImpl) Warningf(format string, args ...interface{}) { |
| 35 gl.LogCall(logging.Warning, 1, format, args) | 35 gl.LogCall(logging.Warning, 1, format, args) |
| 36 } | 36 } |
| 37 func (gl *loggerImpl) Errorf(format string, args ...interface{}) { | 37 func (gl *loggerImpl) Errorf(format string, args ...interface{}) { |
| 38 gl.LogCall(logging.Error, 1, format, args) | 38 gl.LogCall(logging.Error, 1, format, args) |
| 39 } | 39 } |
| 40 | 40 |
| 41 // TODO(riannucci): prefix with caller's code location. | 41 // TODO(riannucci): prefix with caller's code location. |
| 42 func (gl *loggerImpl) LogCall(l logging.Level, calldepth int, format string, arg s []interface{}) { | 42 func (gl *loggerImpl) LogCall(l logging.Level, calldepth int, format string, arg s []interface{}) { |
| 43 » if gl.aeCtx == nil || !logging.IsLogging(gl.aeCtx, l) { | 43 » if gl.aeCtx == nil || !logging.IsLogging(gl.ic, l) { |
|
iannucci
2015/12/23 16:34:43
If you look below (line 62), we use the ic context
| |
| 44 return | 44 return |
| 45 } | 45 } |
| 46 | 46 |
| 47 var logf func(context.Context, string, ...interface{}) | 47 var logf func(context.Context, string, ...interface{}) |
| 48 switch l { | 48 switch l { |
| 49 case logging.Debug: | 49 case logging.Debug: |
| 50 logf = log.Debugf | 50 logf = log.Debugf |
| 51 case logging.Info: | 51 case logging.Info: |
| 52 logf = log.Infof | 52 logf = log.Infof |
| 53 case logging.Warning: | 53 case logging.Warning: |
| 54 logf = log.Warningf | 54 logf = log.Warningf |
| 55 | 55 |
| 56 case logging.Error: | 56 case logging.Error: |
| 57 fallthrough | 57 fallthrough |
| 58 default: | 58 default: |
| 59 logf = log.Errorf | 59 logf = log.Errorf |
| 60 } | 60 } |
| 61 | 61 |
| 62 fields := logging.GetFields(gl.ic) | 62 fields := logging.GetFields(gl.ic) |
| 63 if len(fields) > 0 { | 63 if len(fields) > 0 { |
| 64 logf(gl.aeCtx, "%s :: %s", fmt.Sprintf(format, args...), fields. FieldString(true)) | 64 logf(gl.aeCtx, "%s :: %s", fmt.Sprintf(format, args...), fields. FieldString(true)) |
| 65 } else { | 65 } else { |
| 66 logf(gl.aeCtx, format, args...) | 66 logf(gl.aeCtx, format, args...) |
| 67 } | 67 } |
| 68 } | 68 } |
| OLD | NEW |