Merge pull request #1173 from ersonp/fix/retrier-logs

Use logging package from skycoin for retrier
skycoin · May 3, 2022 · 231dee9 · 231dee9
2 parents b7924dc + 3e16643
commit 231dee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/apps/skysocks-client/skysocks-client.go b/cmd/apps/skysocks-client/skysocks-client.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/skycoin/skycoin/src/util/logging"
 
 	"github.com/skycoin/skywire-utilities/pkg/buildinfo"
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
@@ -28,7 +28,7 @@ const (
 	socksPort = routing.Port(3)
 )
 
-var log = logrus.New()
+var log = logging.MustGetLogger("skysocks-client")
 
 var r = netutil.NewRetrier(log, time.Second, netutil.DefaultMaxBackoff, 0, 1)
 

diff --git a/pkg/visor/init.go b/pkg/visor/init.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/ccding/go-stun/stun"
-	"github.com/sirupsen/logrus"
 	"github.com/skycoin/dmsg/pkg/direct"
 	dmsgdisc "github.com/skycoin/dmsg/pkg/disc"
 	"github.com/skycoin/dmsg/pkg/dmsg"
@@ -646,7 +645,8 @@ func vpnEnvMaker(conf *visorconfig.V1, dmsgC, dmsgDC *dmsg.Client, tpRemoteAddrs
 		if conf.Dmsg != nil {
 			envCfg.DmsgDiscovery = conf.Dmsg.Discovery
 
-			r := netutil.NewRetrier(logrus.New(), 1*time.Second, 10*time.Second, 0, 1)
+			log := conf.MasterLogger().PackageLogger("vpn_env_maker")
+			r := netutil.NewRetrier(log, 1*time.Second, 10*time.Second, 0, 1)
 			err := r.Do(context.Background(), func() error {
 				for _, ses := range dmsgC.AllSessions() {
 					envCfg.DmsgServers = append(envCfg.DmsgServers, ses.RemoteTCPAddr().String())