Skip to content

Commit 13eebcb

Browse files
authored
chore: add logs to exit errors (#5063)
1 parent 38eb6e4 commit 13eebcb

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

cmd/bee/cmd/start.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
206206
if len(resolverEndpoints) > 0 {
207207
resolverCfgs, err = multiresolver.ParseConnectionStrings(resolverEndpoints)
208208
if err != nil {
209-
return nil, err
209+
return nil, fmt.Errorf("parse resolver endpoints: %w", err)
210210
}
211211
}
212212

213213
signerConfig, err := c.configureSigner(cmd, logger)
214214
if err != nil {
215-
return nil, err
215+
return nil, fmt.Errorf("configure signer: %w", err)
216216
}
217217

218218
bootNode := c.config.GetBool(optionNameBootnodeMode)

pkg/node/node.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,12 @@ func NewBee(
264264

265265
stateStore, stateStoreMetrics, err := InitStateStore(logger, o.DataDir, o.StatestoreCacheCapacity)
266266
if err != nil {
267-
return nil, err
267+
return nil, fmt.Errorf("init state store: %w", err)
268268
}
269269

270270
pubKey, err := signer.PublicKey()
271271
if err != nil {
272-
return nil, err
272+
return nil, fmt.Errorf("signer public key: %w", err)
273273
}
274274

275275
nonce, nonceExists, err := overlayNonceExists(stateStore)
@@ -501,7 +501,7 @@ func NewBee(
501501
if o.SwapEnable {
502502
chequebookFactory, err = InitChequebookFactory(logger, chainBackend, chainID, transactionService, o.SwapFactoryAddress)
503503
if err != nil {
504-
return nil, err
504+
return nil, fmt.Errorf("init chequebook factory: %w", err)
505505
}
506506

507507
erc20Address, err := chequebookFactory.ERC20Address(ctx)
@@ -526,7 +526,7 @@ func NewBee(
526526
erc20Service,
527527
)
528528
if err != nil {
529-
return nil, err
529+
return nil, fmt.Errorf("init chequebook service: %w", err)
530530
}
531531
}
532532

@@ -662,7 +662,7 @@ func NewBee(
662662

663663
bzzTokenAddress, err := postagecontract.LookupERC20Address(ctx, transactionService, postageStampContractAddress, postageStampContractABI, chainEnabled)
664664
if err != nil {
665-
return nil, err
665+
return nil, fmt.Errorf("lookup erc20 postage address: %w", err)
666666
}
667667

668668
postageStampContractService = postagecontract.New(
@@ -682,7 +682,7 @@ func NewBee(
682682

683683
batchSvc, err = batchservice.New(stateStore, batchStore, logger, eventListener, overlayEthAddress.Bytes(), post, sha3.New256, o.Resync)
684684
if err != nil {
685-
return nil, err
685+
return nil, fmt.Errorf("init batch service: %w", err)
686686
}
687687

688688
// Construct protocols.
@@ -893,7 +893,7 @@ func NewBee(
893893
transactionService,
894894
)
895895
if err != nil {
896-
return nil, err
896+
return nil, fmt.Errorf("init swap service: %w", err)
897897
}
898898
b.priceOracleCloser = priceOracle
899899

@@ -1033,7 +1033,7 @@ func NewBee(
10331033

10341034
stake, err := stakingContract.GetPotentialStake(ctx)
10351035
if err != nil {
1036-
return nil, err
1036+
return nil, fmt.Errorf("get potential stake: %w", err)
10371037
}
10381038

10391039
if stake.Cmp(big.NewInt(0)) > 0 {
@@ -1050,7 +1050,7 @@ func NewBee(
10501050
// make sure that the staking contract has the up to date height
10511051
tx, updated, err := stakingContract.UpdateHeight(ctx)
10521052
if err != nil {
1053-
return nil, err
1053+
return nil, fmt.Errorf("update height in staking contract: %w", err)
10541054
}
10551055
if updated {
10561056
logger.Info("updated new reserve capacity doubling height in the staking contract", "transaction", tx, "new_height", o.ReserveCapacityDoubling)
@@ -1214,11 +1214,11 @@ func NewBee(
12141214
}
12151215

12161216
if err := kad.Start(ctx); err != nil {
1217-
return nil, err
1217+
return nil, fmt.Errorf("start kademlia: %w", err)
12181218
}
12191219

12201220
if err := p2ps.Ready(); err != nil {
1221-
return nil, err
1221+
return nil, fmt.Errorf("p2ps ready: %w", err)
12221222
}
12231223

12241224
return b, nil
@@ -1355,7 +1355,7 @@ func (b *Bee) Shutdown() error {
13551355
return mErr
13561356
}
13571357

1358-
var ErrShutdownInProgress error = errors.New("shutdown in progress")
1358+
var ErrShutdownInProgress = errors.New("shutdown in progress")
13591359

13601360
func isChainEnabled(o *Options, swapEndpoint string, logger log.Logger) bool {
13611361
chainDisabled := swapEndpoint == ""

0 commit comments

Comments
 (0)