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.

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

Add log package #54

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions examples/examplepb/a_bit_of_everything.pb.gw.go

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

8 changes: 4 additions & 4 deletions examples/examplepb/echo_service.pb.gw.go

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

22 changes: 11 additions & 11 deletions examples/examplepb/flow_combination.pb.gw.go

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

39 changes: 39 additions & 0 deletions log/glog/glog.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
Package glog wraps github.com/golang/glog for grpc-gateway logging.
*/
package glog

import (
"github.com/gengo/grpc-gateway/log"
"github.com/golang/glog"
)

func init() {
log.SetLogger(&gLogger{})
}

type gLogger struct{}

func (l *gLogger) Infof(format string, args ...interface{}) {
glog.Infof(format, args...)
}

func (l *gLogger) Infoln(args ...interface{}) {
glog.Infoln(args...)
}

func (l *gLogger) Warnf(format string, args ...interface{}) {
glog.Warningf(format, args...)
}

func (l *gLogger) Warnln(args ...interface{}) {
glog.Warningln(args...)
}

func (l *gLogger) Errorf(format string, args ...interface{}) {
glog.Errorf(format, args...)
}

func (l *gLogger) Errorln(args ...interface{}) {
glog.Errorln(args...)
}
61 changes: 61 additions & 0 deletions log/log.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
Package log defines logging for grpc-gateway.
*/
package log

import (
"log"
"os"
)

var globalLogger Logger = NewLogger(log.New(os.Stderr, "", log.LstdFlags))

// Logger provides an interface for logging implementations for grpc-gateway.
type Logger interface {
Infof(format string, args ...interface{})
Infoln(args ...interface{})
Warnf(format string, args ...interface{})
Warnln(args ...interface{})
Errorf(format string, args ...interface{})
Errorln(args ...interface{})
}

// SetLogger sets the logger that is used in grpc-gateway.
func SetLogger(l Logger) {
globalLogger = l
}

// NewLogger returns a Logger that wraps a log.Logger from Go's standard log package.
func NewLogger(l *log.Logger) Logger {
return newLogger(l)
}

// Infof logs an info message in the manner of fmt.Printf.
func Infof(format string, args ...interface{}) {
globalLogger.Infof(format, args...)
}

// Infoln logs an info message in the manner of fmt.Println.
func Infoln(args ...interface{}) {
globalLogger.Infoln(args...)
}

// Warnf logs an info message in the manner of fmt.Printf.
func Warnf(format string, args ...interface{}) {
globalLogger.Warnf(format, args...)
}

// Warnln logs an info message in the manner of fmt.Println.
func Warnln(args ...interface{}) {
globalLogger.Warnln(args...)
}

// Errorf logs an info message in the manner of fmt.Printf.
func Errorf(format string, args ...interface{}) {
globalLogger.Errorf(format, args...)
}

// Errorln logs an info message in the manner of fmt.Println.
func Errorln(args ...interface{}) {
globalLogger.Errorln(args...)
}
35 changes: 35 additions & 0 deletions log/logger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package log

import "log"

type logger struct {
*log.Logger
}

func newLogger(l *log.Logger) *logger {
return &logger{l}
}

func (l *logger) Infof(format string, args ...interface{}) {
l.Printf(format, args...)
}

func (l *logger) Infoln(args ...interface{}) {
l.Println(args...)
}

func (l *logger) Warnf(format string, args ...interface{}) {
l.Printf(format, args...)
}

func (l *logger) Warnln(args ...interface{}) {
l.Println(args...)
}

func (l *logger) Errorf(format string, args ...interface{}) {
l.Printf(format, args...)
}

func (l *logger) Errorln(args ...interface{}) {
l.Println(args...)
}
6 changes: 3 additions & 3 deletions protoc-gen-grpc-gateway/descriptor/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"

"github.com/golang/glog"
"github.com/gengo/grpc-gateway/log"
descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
)
Expand Down Expand Up @@ -108,7 +108,7 @@ func (r *Registry) registerMsg(file *File, outerPath []string, msgs []*descripto
}
file.Messages = append(file.Messages, m)
r.msgs[m.FQMN()] = m
glog.V(1).Infof("register name: %s", m.FQMN())
log.Infof("register name: %s", m.FQMN())

var outers []string
outers = append(outers, outerPath...)
Expand All @@ -120,7 +120,7 @@ func (r *Registry) registerMsg(file *File, outerPath []string, msgs []*descripto
// LookupMsg looks up a message type by "name".
// It tries to resolve "name" from "location" if "name" is a relative message name.
func (r *Registry) LookupMsg(location, name string) (*Message, error) {
glog.V(1).Infof("lookup %s from %s", name, location)
log.Infof("lookup %s from %s", name, location)
if strings.HasPrefix(name, ".") {
m, ok := r.msgs[name]
if !ok {
Expand Down
Loading