aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranklin <mr_franklin@126.com>2018-11-20 22:16:40 +0800
committerFranklin <mr_franklin@126.com>2018-11-20 22:16:40 +0800
commit21dd59bd047d1f291c1a773b690825a3654ea969 (patch)
tree39ac1431427c6cfa0fd5d111462f237066413ba4
parent3d997b6decfaa42e37521ae20bf58886c8b2de8f (diff)
downloaddexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar.gz
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar.bz2
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar.lz
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar.xz
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.tar.zst
dexon-21dd59bd047d1f291c1a773b690825a3654ea969.zip
.
-rw-r--r--core/blockchain.go6
-rw-r--r--node/node.go2
-rw-r--r--rpc/ipc.go6
3 files changed, 9 insertions, 5 deletions
diff --git a/core/blockchain.go b/core/blockchain.go
index d173b2de2..ee1c0702b 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -445,7 +445,11 @@ func (bc *BlockChain) repair(head **types.Block) error {
return nil
}
// Otherwise rewind one block and recheck state availability there
- (*head) = bc.GetBlock((*head).ParentHash(), (*head).NumberU64()-1)
+ block := bc.GetBlock((*head).ParentHash(), (*head).NumberU64()-1)
+ if block == nil {
+ return fmt.Errorf("failed to repair block, can not get block at height %d", (*head).NumberU64())
+ }
+ (*head) = block
}
}
diff --git a/node/node.go b/node/node.go
index 85299dba7..0a931a9dd 100644
--- a/node/node.go
+++ b/node/node.go
@@ -322,7 +322,7 @@ func (n *Node) stopIPC() {
n.ipcListener.Close()
n.ipcListener = nil
- n.log.Info("IPC endpoint closed", "endpoint", n.ipcEndpoint)
+ n.log.Info("IPC endpoint closed", "url", n.ipcEndpoint)
}
if n.ipcHandler != nil {
n.ipcHandler.Stop()
diff --git a/rpc/ipc.go b/rpc/ipc.go
index b05e503d7..1467f7a0c 100644
--- a/rpc/ipc.go
+++ b/rpc/ipc.go
@@ -24,17 +24,17 @@ import (
"github.com/ethereum/go-ethereum/p2p/netutil"
)
-// ServeListener accepts connections on l, serving JSON-RPC on them.
+// ServeListener accepts connections on l, serving IPC-RPC on them.
func (srv *Server) ServeListener(l net.Listener) error {
for {
conn, err := l.Accept()
if netutil.IsTemporaryError(err) {
- log.Warn("RPC accept error", "err", err)
+ log.Warn("IPC accept error", "err", err)
continue
} else if err != nil {
return err
}
- log.Trace("Accepted connection", "addr", conn.RemoteAddr())
+ log.Trace("IPC accepted connection")
go srv.ServeCodec(NewJSONCodec(conn), OptionMethodInvocation|OptionSubscriptions)
}
}