From ea817619919239c6bcebaaae26fe56a96ee6530b Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Fri, 2 Jul 2021 04:30:55 +0700
Subject: [PATCH] enable private rpc by default in Erigon, better logs in the
beginning (#2262)
---
cmd/rpcdaemon/cli/config.go | 2 ++
cmd/sentry/download/sentry.go | 2 +-
p2p/enode/localnode.go | 2 +-
p2p/server.go | 4 +++-
turbo/cli/flags.go | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go
index dd0711e96d..d2c035c044 100644
--- a/cmd/rpcdaemon/cli/config.go
+++ b/cmd/rpcdaemon/cli/config.go
@@ -186,6 +186,8 @@ func RemoteServices(cfg Flags, rootCancel context.CancelFunc) (kv ethdb.RoKV, et
}
kv = snapKv
}
+ } else {
+ log.Info("if you run RPCDaemon on same machine with Erigon add --datadir option")
}
if cfg.PrivateApiAddr != "" {
remoteKv, err := kv2.NewRemote(gointerfaces.VersionFromProto(remotedbserver.KvServiceAPIVersion)).Path(cfg.PrivateApiAddr).Open(cfg.TLSCertfile, cfg.TLSKeyFile, cfg.TLSCACert)
diff --git a/cmd/sentry/download/sentry.go b/cmd/sentry/download/sentry.go
index b6baebbf55..26a6611084 100644
--- a/cmd/sentry/download/sentry.go
+++ b/cmd/sentry/download/sentry.go
@@ -922,7 +922,7 @@ func (ss *SentryServerImpl) addStream(ids []proto_sentry.MessageId, server proto
}
func (ss *SentryServerImpl) Messages(req *proto_sentry.MessagesRequest, server proto_sentry.Sentry_MessagesServer) error {
- log.Info(fmt.Sprintf("[Messages] new subscriber to: %s", req.Ids))
+ log.Debug(fmt.Sprintf("[Messages] new subscriber to: %s", req.Ids))
clean := ss.addStream(req.Ids, server)
defer clean()
select {
diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go
index 6cf0405cc2..05045a1981 100644
--- a/p2p/enode/localnode.go
+++ b/p2p/enode/localnode.go
@@ -281,7 +281,7 @@ func (ln *LocalNode) sign() {
panic(fmt.Errorf("enode: can't verify local record: %v", err))
}
ln.cur.Store(n)
- log.Info("New local node record", "seq", ln.seq, "id", n.ID(), "ip", n.IP(), "udp", n.UDP(), "tcp", n.TCP())
+ log.Debug("New local node record", "seq", ln.seq, "id", n.ID(), "ip", n.IP(), "udp", n.UDP(), "tcp", n.TCP())
}
func (ln *LocalNode) bumpSeq() {
diff --git a/p2p/server.go b/p2p/server.go
index 226fd5d935..ae2495a43e 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -719,7 +719,9 @@ func (srv *Server) run() {
srv.log.Error("Write enode to file failed", "self", srv.localnode.Node().URLv4())
}
}
- srv.log.Info("Started P2P networking", "self", srv.localnode.Node().URLv4())
+ if len(srv.Config.Protocols) > 0 {
+ srv.log.Info("Started P2P networking", "version", srv.Config.Protocols[0].Version, "self", srv.localnode.Node().URLv4())
+ }
defer srv.loopWG.Done()
defer srv.nodedb.Close()
defer srv.discmix.Close()
diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go
index 4ee31caf5f..02560d3229 100644
--- a/turbo/cli/flags.go
+++ b/turbo/cli/flags.go
@@ -40,7 +40,7 @@ var (
PrivateApiAddr = cli.StringFlag{
Name: "private.api.addr",
Usage: "private api network address, for example: 127.0.0.1:9090, empty string means not to start the listener. do not expose to public network. serves remote database interface",
- Value: "",
+ Value: "127.0.0.1:9090",
}
PrivateApiRateLimit = cli.IntFlag{
--
GitLab