aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Evangelatov <anton.evangelatov@gmail.com>2018-08-21 16:34:10 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-08-21 16:34:10 +0800
commitdcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d (patch)
tree02c969af897b8aaf9306380f6874aa381e1d8510
parent85c6a1c526983f82fcd5e074fdc0bbd264b3815c (diff)
downloadgo-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar.gz
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar.bz2
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar.lz
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar.xz
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.tar.zst
go-tangerine-dcd97c41fa2789f2e642cb52b8e18c5bd7bcc81d.zip
swarm, swarm/network, swarm/pss: log error and fix logs (#17410)
* swarm, swarm/network, swarm/pss: log error and fix logs * swarm/pss: log compressed publickey
-rw-r--r--swarm/network/hive.go4
-rw-r--r--swarm/pss/pss.go5
-rw-r--r--swarm/swarm.go34
3 files changed, 21 insertions, 22 deletions
diff --git a/swarm/network/hive.go b/swarm/network/hive.go
index a54a17d29..366021088 100644
--- a/swarm/network/hive.go
+++ b/swarm/network/hive.go
@@ -102,10 +102,10 @@ func NewHive(params *HiveParams, overlay Overlay, store state.Store) *Hive {
// server is used to connect to a peer based on its NodeID or enode URL
// these are called on the p2p.Server which runs on the node
func (h *Hive) Start(server *p2p.Server) error {
- log.Info(fmt.Sprintf("%08x hive starting", h.BaseAddr()[:4]))
+ log.Info("Starting hive", "baseaddr", fmt.Sprintf("%x", h.BaseAddr()[:4]))
// if state store is specified, load peers to prepopulate the overlay address book
if h.Store != nil {
- log.Info("detected an existing store. trying to load peers")
+ log.Info("Detected an existing store. trying to load peers")
if err := h.loadPeers(); err != nil {
log.Error(fmt.Sprintf("%08x hive encoutered an error trying to load peers", h.BaseAddr()[:4]))
return err
diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go
index 5c060b248..8459211dd 100644
--- a/swarm/pss/pss.go
+++ b/swarm/pss/pss.go
@@ -232,12 +232,13 @@ func (p *Pss) Start(srv *p2p.Server) error {
}
}
}()
- log.Debug("Started pss", "public key", common.ToHex(crypto.FromECDSAPub(p.PublicKey())))
+ log.Info("Started Pss")
+ log.Info("Loaded EC keys", "pubkey", common.ToHex(crypto.FromECDSAPub(p.PublicKey())), "secp256", common.ToHex(crypto.CompressPubkey(p.PublicKey())))
return nil
}
func (p *Pss) Stop() error {
- log.Info("pss shutting down")
+ log.Info("Pss shutting down")
close(p.quitC)
return nil
}
diff --git a/swarm/swarm.go b/swarm/swarm.go
index a895bdfa5..736cd37de 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -121,12 +121,10 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
backend: backend,
privateKey: config.ShiftPrivateKey(),
}
- log.Debug(fmt.Sprintf("Setting up Swarm service components"))
+ log.Debug("Setting up Swarm service components")
config.HiveParams.Discovery = true
- log.Debug(fmt.Sprintf("-> swarm net store shared access layer to Swarm Chunk Store"))
-
nodeID, err := discover.HexID(config.NodeID)
if err != nil {
return nil, err
@@ -201,8 +199,7 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
resourceHandler,
}
- // setup local store
- log.Debug(fmt.Sprintf("Set up local storage"))
+ log.Debug("Setup local storage")
self.bzz = network.NewBzz(bzzconfig, to, stateStore, stream.Spec, self.streamer.Run)
@@ -216,11 +213,9 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
}
self.api = api.NewAPI(self.fileStore, self.dns, resourceHandler, self.privateKey)
- // Manifests for Smart Hosting
- log.Debug(fmt.Sprintf("-> Web3 virtual server API"))
self.sfs = fuse.NewSwarmFS(self.api)
- log.Debug("-> Initializing Fuse file system")
+ log.Debug("Initialized FUSE filesystem")
return self, nil
}
@@ -341,7 +336,7 @@ func (self *Swarm) Start(srv *p2p.Server) error {
// update uaddr to correct enode
newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String()))
- log.Warn("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr))
+ log.Info("Updated bzz local addr", "oaddr", fmt.Sprintf("%x", newaddr.OAddr), "uaddr", fmt.Sprintf("%s", newaddr.UAddr))
// set chequebook
if self.config.SwapEnabled {
ctx := context.Background() // The initial setup has no deadline.
@@ -354,18 +349,17 @@ func (self *Swarm) Start(srv *p2p.Server) error {
log.Debug(fmt.Sprintf("SWAP disabled: no cheque book set"))
}
- log.Warn(fmt.Sprintf("Starting Swarm service"))
+ log.Info("Starting bzz service")
err := self.bzz.Start(srv)
if err != nil {
log.Error("bzz failed", "err", err)
return err
}
- log.Info(fmt.Sprintf("Swarm network started on bzz address: %x", self.bzz.Hive.Overlay.BaseAddr()))
+ log.Info("Swarm network started", "bzzaddr", fmt.Sprintf("%x", self.bzz.Hive.Overlay.BaseAddr()))
if self.ps != nil {
self.ps.Start(srv)
- log.Info("Pss started")
}
// start swarm http proxy server
@@ -373,13 +367,17 @@ func (self *Swarm) Start(srv *p2p.Server) error {
addr := net.JoinHostPort(self.config.ListenAddr, self.config.Port)
server := httpapi.NewServer(self.api, self.config.Cors)
- go server.ListenAndServe(addr)
- }
-
- log.Debug(fmt.Sprintf("Swarm http proxy started on port: %v", self.config.Port))
+ if self.config.Cors != "" {
+ log.Debug("Swarm HTTP proxy CORS headers", "allowedOrigins", self.config.Cors)
+ }
- if self.config.Cors != "" {
- log.Debug(fmt.Sprintf("Swarm http proxy started with corsdomain: %v", self.config.Cors))
+ log.Debug("Starting Swarm HTTP proxy", "port", self.config.Port)
+ go func() {
+ err := server.ListenAndServe(addr)
+ if err != nil {
+ log.Error("Could not start Swarm HTTP proxy", "err", err.Error())
+ }
+ }()
}
self.periodicallyUpdateGauges()