noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to latest cloud.google.com package

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2017-11-15 18:18:52 +00:00
parent a4d6a0801a
commit 973439e73a
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
log/google.go
View file

@ -23,12 +23,13 @@ import (
"runtime/debug" "runtime/debug"
"github.com/abcum/fibre" "github.com/abcum/fibre"
"github.com/abcum/surreal/util/build"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/abcum/surreal/util/build"
"cloud.google.com/go/compute/metadata" "cloud.google.com/go/compute/metadata"
"cloud.google.com/go/errors" "cloud.google.com/go/errorreporting"
"cloud.google.com/go/logging" "cloud.google.com/go/logging"
"google.golang.org/api/option" "google.golang.org/api/option"
"google.golang.org/genproto/googleapis/api/monitoredres" "google.golang.org/genproto/googleapis/api/monitoredres"
@ -40,9 +41,9 @@ type HookGoogle struct {
credentials string credentials string
level logrus.Level level logrus.Level
levels []logrus.Level levels []logrus.Level
errclient *errors.Client
logclient *logging.Client logclient *logging.Client
logbuffer *logging.Logger logbuffer *logging.Logger
errclient *errorreporting.Client
} }
func NewGoogleHook(level, name, project, credentials string) (hook *HookGoogle, err error) { func NewGoogleHook(level, name, project, credentials string) (hook *HookGoogle, err error) {
@ -134,12 +135,13 @@ func NewGoogleHook(level, name, project, credentials string) (hook *HookGoogle,
// endpoint to ensure the settings // endpoint to ensure the settings
// and authentication are correct. // and authentication are correct.
hook.errclient, err = errors.NewClient( hook.errclient, err = errorreporting.NewClient(
context.Background(), context.Background(),
hook.project, hook.project,
hook.name, errorreporting.Config{
build.GetInfo().Ver, ServiceName: hook.name,
true, ServiceVersion: build.GetInfo().Ver,
},
) )
if err != nil { if err != nil {
@ -174,15 +176,19 @@ func (h *HookGoogle) Fire(entry *logrus.Entry) error {
switch entry.Level { switch entry.Level {
case logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel: case logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel:
ctx := context.Background() ctx := context.Background()
err := fmt.Sprintf("%s\n%s", entry.Message, debug.Stack()) err := fmt.Errorf("%s\n%s", entry.Message, debug.Stack())
go func() { go func() {
for _, v := range entry.Data { for _, v := range entry.Data {
switch i := v.(type) { switch i := v.(type) {
case *http.Request: case *http.Request:
h.errclient.Report(ctx, i, err) h.errclient.ReportSync(ctx, errorreporting.Entry{
Error: err, Req: i,
})
return return
case *fibre.Context: case *fibre.Context:
h.errclient.Report(ctx, i.Request().Request, err) h.errclient.ReportSync(ctx, errorreporting.Entry{
Error: err, Req: i.Request().Request,
})
return return
} }
} }