Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert to using Fluentdformatter #463

Merged
merged 1 commit into from
Dec 28, 2018
Merged

Convert to using Fluentdformatter #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,8 @@

[[override]]
name = "github.com/grpc-ecosystem/grpc-gateway"
version = "1.5.1"
version = "1.5.1"

[[constraint]]
branch = "master"
name = "github.com/joonix/log"
8 changes: 2 additions & 6 deletions pkg/util/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package runtime
import (
"fmt"

joonix "github.com/joonix/log"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/runtime"
Expand All @@ -33,12 +34,7 @@ type stackTracer interface {

// replace the standard glog error logger, with a logrus one
func init() {

logrus.SetFormatter(&logrus.JSONFormatter{
FieldMap: logrus.FieldMap{
logrus.FieldKeyLevel: "severity",
},
})
logrus.SetFormatter(&joonix.FluentdFormatter{})

runtime.ErrorHandlers[0] = func(err error) {
if stackTrace, ok := err.(stackTracer); ok {
Expand Down
21 changes: 21 additions & 0 deletions vendor/github.com/joonix/log/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions vendor/github.com/joonix/log/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions vendor/github.com/joonix/log/fluentd.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.