diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-23 22:49:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 22:49:05 +0800 |
| commit | 357732a8404c9fe4d02f041d20a0d05381a3e6d1 (patch) | |
| tree | edaf8a63eb7f7434cd9b9cbd764b3c4c3d76191e /rpc/websocket.go | |
| parent | 29fac7de448c85049a97cbec3dc0819122bd2cb0 (diff) | |
| parent | f89dd627760b43bd405cb3db1e5efdb100835db5 (diff) | |
| download | dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.gz dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.bz2 dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.lz dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.xz dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.tar.zst dexon-357732a8404c9fe4d02f041d20a0d05381a3e6d1.zip | |
Merge pull request #3696 from karalabe/contextual-logger
Contextual logger
Diffstat (limited to 'rpc/websocket.go')
| -rw-r--r-- | rpc/websocket.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpc/websocket.go b/rpc/websocket.go index fc3cd0709..f4271fda8 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/log" + "golang.org/x/net/context" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" @@ -76,14 +76,14 @@ func wsHandshakeValidator(allowedOrigins []string) func(*websocket.Config, *http } } - glog.V(logger.Debug).Infof("Allowed origin(s) for WS RPC interface %v\n", origins.List()) + log.Debug(fmt.Sprintf("Allowed origin(s) for WS RPC interface %v\n", origins.List())) f := func(cfg *websocket.Config, req *http.Request) error { origin := strings.ToLower(req.Header.Get("Origin")) if allowAllOrigins || origins.Has(origin) { return nil } - glog.V(logger.Debug).Infof("origin '%s' not allowed on WS-RPC interface\n", origin) + log.Debug(fmt.Sprintf("origin '%s' not allowed on WS-RPC interface\n", origin)) return fmt.Errorf("origin %s not allowed", origin) } |