diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-03 19:52:58 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-03 19:52:58 +0800 |
| commit | d52a693f802ce4445cc02a879646ca5466fb2a06 (patch) | |
| tree | 0e3a017c071c8996d7470f5477087ee201ce2da2 /node/node.go | |
| parent | 8241fa522772837f0d05511f20caa6da1d5a3209 (diff) | |
| parent | 258cc73ea970890a5b75bf27197c3a6667f3bc5a (diff) | |
| download | go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.gz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.bz2 go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.lz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.xz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.zst go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.zip | |
Merge branch 'develop' into release/1.4
Conflicts:
cmd/geth/main.go
Diffstat (limited to 'node/node.go')
| -rw-r--r-- | node/node.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/node.go b/node/node.go index 18c3f91d8..06a1b7aed 100644 --- a/node/node.go +++ b/node/node.go @@ -311,7 +311,7 @@ func (n *Node) startIPC(apis []rpc.API) error { glog.V(logger.Error).Infof("IPC accept failed: %v", err) continue } - go handler.ServeCodec(rpc.NewJSONCodec(conn), rpc.OptionMethodInvocation | rpc.OptionSubscriptions) + go handler.ServeCodec(rpc.NewJSONCodec(conn), rpc.OptionMethodInvocation|rpc.OptionSubscriptions) } }() // All listeners booted successfully |