Merge branch 'milestone2' into feature/update-visor

# Conflicts: # go.sum # vendor/modules.txt
skycoin · Feb 27, 2020 · 5416066 · 5416066
2 parents 39494ac + 2427496
commit 5416066
Show file tree

Hide file tree

Showing 23 changed files with 407 additions and 60 deletions.
diff --git a/CONTRIBUTE.md → CONTRIBUTING.md b/CONTRIBUTE.md → CONTRIBUTING.md
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
 go 1.13
 
 require (
-	github.com/SkycoinProject/dmsg v0.0.0-20200203035036-dbbed345b710
+	github.com/SkycoinProject/dmsg v0.0.0-20200220122410-79d9d7bac617
 	github.com/SkycoinProject/skycoin v0.27.0
 	github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5

diff --git a/go.sum b/go.sum
diff --git a/pkg/app/appserver/proc_manager.go b/pkg/app/appserver/proc_manager.go
@@ -110,7 +110,7 @@ func (m *procManager) Wait(name string) error {
 		}
 
 		if _, err := m.pop(name); err != nil {
-			m.log.Debugf("Pop app: %v", err)
+			m.log.Debugf("Remove app <%v>: %v", name, err)
 		}
 
 		return err

diff --git a/vendor/github.com/SkycoinProject/dmsg/.gitignore b/vendor/github.com/SkycoinProject/dmsg/.gitignore
diff --git a/vendor/github.com/SkycoinProject/dmsg/Makefile b/vendor/github.com/SkycoinProject/dmsg/Makefile
diff --git a/vendor/github.com/SkycoinProject/dmsg/README.md b/vendor/github.com/SkycoinProject/dmsg/README.md
diff --git a/vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go b/vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/client.go b/vendor/github.com/SkycoinProject/dmsg/client.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/const.go b/vendor/github.com/SkycoinProject/dmsg/const.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/disc/client.go b/vendor/github.com/SkycoinProject/dmsg/disc/client.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/disc/entry.go b/vendor/github.com/SkycoinProject/dmsg/disc/entry.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/entity_common.go b/vendor/github.com/SkycoinProject/dmsg/entity_common.go
diff --git a/vendor/github.com/SkycoinProject/dmsg/go.mod b/vendor/github.com/SkycoinProject/dmsg/go.mod