Merge pull request #490 from evanlinjin/bug/fix-app-panics

Fix various panics.
skycoin · Jul 19, 2019 · 96cb88e · 96cb88e
2 parents 1d4b619 + ccaf5d9
commit 96cb88e
Show file tree

Hide file tree

Showing 21 changed files with 1,008 additions and 57 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/common v0.4.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7
+	github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c
 	github.com/skycoin/skycoin v0.26.0
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.3.0

diff --git a/go.sum b/go.sum
@@ -93,6 +93,8 @@ github.com/skycoin/dmsg v0.0.0-20190628092537-e69f75132be9 h1:Y7CZdMtd5HxkgIaAIL
 github.com/skycoin/dmsg v0.0.0-20190628092537-e69f75132be9/go.mod h1:AwwGhHjvXpbYVz8oYFaXKWHwscc5nHyHjssQBtQgmZg=
 github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7 h1:4LjXC4C+RJtsyJKlmtaDPhK7uaCImPZTvmVNkVHR2io=
 github.com/skycoin/dmsg v0.0.0-20190708174832-eb49a4b802f7/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU=
+github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c h1:ZEE/nDdNWKDoBPAtCZAejJHaaopMbR/+4owT1U+Xa48=
+github.com/skycoin/dmsg v0.0.0-20190719095515-52043626400c/go.mod h1:obZYZp8eKR7Xqz+KNhJdUE6Gvp6rEXbDO8YTlW2YXgU=
 github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o=
 github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -243,7 +243,10 @@ func (app *App) closeConn(data []byte) error {
 	delete(app.conns, loop)
 	app.mu.Unlock()
 
-	return conn.Close()
+	if conn != nil {
+		return conn.Close()
+	}
+	return nil
 }
 
 func (app *App) confirmLoop(data []byte) error {

diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go
@@ -336,7 +336,7 @@ func (tm *Manager) acceptTransport(ctx context.Context, factory Factory) (*Manag
 	entry, err := settlementResponderHandshake().Do(tm, tr, 30*time.Second)
 	if err != nil {
 		go func() {
-			if err = tr.Close(); err != nil {
+			if err := tr.Close(); err != nil {
 				tm.Logger.Warnf("Failed to close transport: %s", err)
 			}
 		}()

diff --git a/vendor/github.com/skycoin/dmsg/.golangci.yml b/vendor/github.com/skycoin/dmsg/.golangci.yml
diff --git a/vendor/github.com/skycoin/dmsg/README.md b/vendor/github.com/skycoin/dmsg/README.md
diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/skycoin/dmsg/client.go
diff --git a/vendor/github.com/skycoin/dmsg/disc/client.go b/vendor/github.com/skycoin/dmsg/disc/client.go
diff --git a/vendor/github.com/skycoin/dmsg/disc/entry.go b/vendor/github.com/skycoin/dmsg/disc/entry.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go b/vendor/github.com/skycoin/dmsg/ioutil/ack_waiter.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go b/vendor/github.com/skycoin/dmsg/ioutil/buf_read.go
diff --git a/vendor/github.com/skycoin/dmsg/ioutil/logging.go b/vendor/github.com/skycoin/dmsg/ioutil/logging.go
diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/skycoin/dmsg/noise/noise.go