roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

swarm, swarm/network, swarm/pss: log error and fix logs (#17410)

Browse Source 
* swarm, swarm/network, swarm/pss: log error and fix logs

* swarm/pss: log compressed publickey
This commit is contained in:
Anton Evangelatov 2018-08-21 10:34:10 +02:00 committed by Péter Szilágyi
parent 85c6a1c526
commit dcd97c41fa
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swarm/network/hive.go
View File

@ -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 // 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 // these are called on the p2p.Server which runs on the node
func (h *Hive) Start(server *p2p.Server) error { 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 state store is specified, load peers to prepopulate the overlay address book
if h.Store != nil { 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 { if err := h.loadPeers(); err != nil {
log.Error(fmt.Sprintf("%08x hive encoutered an error trying to load peers", h.BaseAddr()[:4])) log.Error(fmt.Sprintf("%08x hive encoutered an error trying to load peers", h.BaseAddr()[:4]))
return err return err

5
swarm/pss/pss.go
View File

@ -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 return nil
} }
func (p *Pss) Stop() error { func (p *Pss) Stop() error {
log.Info("pss shutting down") log.Info("Pss shutting down")
close(p.quitC) close(p.quitC)
return nil return nil
} }

32
swarm/swarm.go
View File

@ -121,12 +121,10 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
backend: backend, backend: backend,
privateKey: config.ShiftPrivateKey(), privateKey: config.ShiftPrivateKey(),
} }
log.Debug(fmt.Sprintf("Setting up Swarm service components")) log.Debug("Setting up Swarm service components")
config.HiveParams.Discovery = true config.HiveParams.Discovery = true
log.Debug(fmt.Sprintf("-> swarm net store shared access layer to Swarm Chunk Store"))
nodeID, err := discover.HexID(config.NodeID) nodeID, err := discover.HexID(config.NodeID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -201,8 +199,7 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
resourceHandler, resourceHandler,
} }
// setup local store log.Debug("Setup local storage")
log.Debug(fmt.Sprintf("Set up local storage"))
self.bzz = network.NewBzz(bzzconfig, to, stateStore, stream.Spec, self.streamer.Run) 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) 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) self.sfs = fuse.NewSwarmFS(self.api)
log.Debug("-> Initializing Fuse file system") log.Debug("Initialized FUSE filesystem")
return self, nil return self, nil
} }
@ -341,7 +336,7 @@ func (self *Swarm) Start(srv *p2p.Server) error {
// update uaddr to correct enode // update uaddr to correct enode
newaddr := self.bzz.UpdateLocalAddr([]byte(srv.Self().String())) 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 // set chequebook
if self.config.SwapEnabled { if self.config.SwapEnabled {
ctx := context.Background() // The initial setup has no deadline. 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.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) err := self.bzz.Start(srv)
if err != nil { if err != nil {
log.Error("bzz failed", "err", err) log.Error("bzz failed", "err", err)
return 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 { if self.ps != nil {
self.ps.Start(srv) self.ps.Start(srv)
log.Info("Pss started")
} }
// start swarm http proxy server // 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) addr := net.JoinHostPort(self.config.ListenAddr, self.config.Port)
server := httpapi.NewServer(self.api, self.config.Cors) server := httpapi.NewServer(self.api, self.config.Cors)
go server.ListenAndServe(addr) if self.config.Cors != "" {
log.Debug("Swarm HTTP proxy CORS headers", "allowedOrigins", self.config.Cors)
} }
log.Debug(fmt.Sprintf("Swarm http proxy started on port: %v", self.config.Port)) log.Debug("Starting Swarm HTTP proxy", "port", self.config.Port)
go func() {
if self.config.Cors != "" { err := server.ListenAndServe(addr)
log.Debug(fmt.Sprintf("Swarm http proxy started with corsdomain: %v", self.config.Cors)) if err != nil {
log.Error("Could not start Swarm HTTP proxy", "err", err.Error())
}
}()
} }
self.periodicallyUpdateGauges() self.periodicallyUpdateGauges()