Skip to content

Commit

Permalink
feat: cleanup logger (time, .Info("Exec"))
Browse files Browse the repository at this point in the history
  • Loading branch information
Reecepbcups committed Aug 7, 2024
1 parent 9243e84 commit d38c1cc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion dockerutil/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func (image *Image) Start(ctx context.Context, cmd []string, opts ContainerOptio
return nil, image.WrapErr(fmt.Errorf("create container %s: %w", containerName, err))
}

logger.Info("About to start container")
logger.Info("Exec")

err = StartContainer(ctx, image.client, cID)
if err != nil {
Expand Down
22 changes: 15 additions & 7 deletions interchain_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package interchaintest

import (
"context"
"fmt"
"testing"

codectypes "github.com/cosmos/cosmos-sdk/codec/types"
Expand All @@ -12,6 +13,8 @@ import (
"github.com/strangelove-ventures/interchaintest/v8/relayer"
"github.com/strangelove-ventures/interchaintest/v8/testreporter"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest"
)

Expand All @@ -37,7 +40,7 @@ func CreateChainWithConfig(t *testing.T, numVals, numFull int, name, version str
}
}

cf := NewBuiltinChainFactory(zaptest.NewLogger(t), []*ChainSpec{
return CreateChainsWithChainSpecs(t, []*ChainSpec{
{
Name: name,
ChainName: name,
Expand All @@ -47,16 +50,21 @@ func CreateChainWithConfig(t *testing.T, numVals, numFull int, name, version str
NumFullNodes: &numFull,
},
})

chains, err := cf.Chains(t.Name())
require.NoError(t, err)

return chains
}

// CreateChainsWithChainSpecs builds multiple chains from the given chain specs.
func CreateChainsWithChainSpecs(t *testing.T, chainSpecs []*ChainSpec) []ibc.Chain {
cf := NewBuiltinChainFactory(zaptest.NewLogger(t), chainSpecs)
config := zap.NewDevelopmentConfig()
config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
config.EncoderConfig.EncodeTime = zapcore.RFC3339TimeEncoder
config.DisableCaller = true

logger, err := config.Build()
if err != nil {
panic(fmt.Sprintf("BUG: failed to create logger: %s", err))
}

cf := NewBuiltinChainFactory(logger, chainSpecs)

chains, err := cf.Chains(t.Name())
require.NoError(t, err)
Expand Down
3 changes: 2 additions & 1 deletion local-interchain/interchain/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ func getLoggerConfig() zap.Config {
config := zap.NewDevelopmentConfig()

config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
config.EncoderConfig.EncodeTime = zapcore.RFC3339TimeEncoder
config.DisableCaller = true

return config
}
Expand Down

0 comments on commit d38c1cc

Please sign in to comment.