alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Addressing review comments

Browse Source 
reverting query string caching in favour of Go 1.9 sqlx features
 moving context definition out of call.End to upper level
This commit is contained in:
Denis Makogon
2017-09-06 09:21:59 +03:00
parent 6a541139a9
commit 9a89366d1b
5 changed files with 86 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/agent/func_logger.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/models"
"github.com/opentracing/opentracing-go"
"github.com/sirupsen/logrus"
)
@@ -56,7 +57,7 @@ func NewFuncLogger(ctx context.Context, appName, path, image, reqID string, logD
reqID: reqID,
})
// TODO / NOTE: we want linew to be first becauase limitw may error if limit
// TODO / NOTE: we want linew to be first because limitw may error if limit
// is reached but we still want to log. we should probably ignore hitting the
// limit error since we really just want to not write too much to db and
// that's handled as is. put buffers back last to avoid misuse, if there's
@@ -110,7 +111,7 @@ type logWriter struct {
func (l *logWriter) Write(b []byte) (int, error) {
log := common.Logger(l.ctx)
log = log.WithFields(logrus.Fields{"user_log": true, "app_name": l.appName, "path": l.path, "image": l.image, "call_id": l.reqID})
log.Println(string(b))
log.Debug(string(b))
return len(b), nil
}
@@ -182,7 +183,9 @@ type dbWriter struct {
}
func (w *dbWriter) Close() error {
return w.db.InsertLog(w.ctx, w.reqID, w.String())
span, ctx := opentracing.StartSpanFromContext(context.Background(), "agent_log_write")
defer span.Finish()
return w.db.InsertLog(ctx, w.reqID, w.String())
}
func (w *dbWriter) Write(b []byte) (int, error) {