diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-20 04:50:54 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-20 04:50:54 +0800 |
| commit | e2d44814a513e7a964797b1e3639343e6682a615 (patch) | |
| tree | 8320092e4b9660e45cdfbcd284f6f841e3696b2d /rpc | |
| parent | bd3a44cac9664ff72584fb123b3348f24c62d066 (diff) | |
| parent | 269c5c71072f9e17e6387f853d626bff1160db5c (diff) | |
| download | dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar.gz dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar.bz2 dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar.lz dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar.xz dexon-e2d44814a513e7a964797b1e3639343e6682a615.tar.zst dexon-e2d44814a513e7a964797b1e3639343e6682a615.zip | |
Merge pull request #1694 from obscuren/hide-fdtrack
fdtrack: hide message
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/comms/http.go | 2 | ||||
| -rw-r--r-- | rpc/comms/ipc_unix.go | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/rpc/comms/http.go b/rpc/comms/http.go index c08b744a1..c165aa27e 100644 --- a/rpc/comms/http.go +++ b/rpc/comms/http.go @@ -29,7 +29,6 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/fdtrack" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/rpc/codec" @@ -178,7 +177,6 @@ func listenHTTP(addr string, h http.Handler) (*stopServer, error) { if err != nil { return nil, err } - l = fdtrack.WrapListener("rpc", l) s := &stopServer{l: l, idle: make(map[net.Conn]struct{})} s.Server = &http.Server{ Addr: addr, diff --git a/rpc/comms/ipc_unix.go b/rpc/comms/ipc_unix.go index 6968fa844..24aefa5f3 100644 --- a/rpc/comms/ipc_unix.go +++ b/rpc/comms/ipc_unix.go @@ -22,7 +22,6 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/fdtrack" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/rpc/codec" @@ -51,16 +50,15 @@ func (self *ipcClient) reconnect() error { func startIpc(cfg IpcConfig, codec codec.Codec, initializer func(conn net.Conn) (shared.EthereumApi, error)) error { os.Remove(cfg.Endpoint) // in case it still exists from a previous run - l, err := net.Listen("unix", cfg.Endpoint) + l, err := net.ListenUnix("unix", &net.UnixAddr{Name: cfg.Endpoint, Net: "unix"}) if err != nil { return err } - l = fdtrack.WrapListener("ipc", l) os.Chmod(cfg.Endpoint, 0600) go func() { for { - conn, err := l.Accept() + conn, err := l.AcceptUnix() if err != nil { glog.V(logger.Error).Infof("Error accepting ipc connection - %v\n", err) continue |