Skip to content

Commit e8b1960

Browse files
Create a logger that automatically extracts the package and uses it as a prefix #815
Signed-off-by: Said Altury <said.altury@ibm.com>
1 parent 275d846 commit e8b1960

File tree

57 files changed

+85
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+85
-76
lines changed

integration/nwo/token/common/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1515
)
1616

17-
var logger = logging.MustGetLogger("token-sdk.integration.token.common")
17+
var logger = logging.MustGetLogger()
1818

1919
const (
2020
TokenKey = "tkn"

integration/nwo/token/fabric/cc/tcc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const (
3131
DefaultTokenChaincodeParamsReplaceSuffix = "/token/services/network/fabric/tcc/params.go"
3232
)
3333

34-
var logger = logging.MustGetLogger("token-sdk.integration.token.fabric.cc")
34+
var logger = logging.MustGetLogger()
3535

3636
type fabricPlatform interface {
3737
Topology() *topology.Topology

integration/nwo/token/fabric/fabric.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/onsi/gomega"
2929
)
3030

31-
var logger = logging.MustGetLogger("token-sdk.integration.token.fabric")
31+
var logger = logging.MustGetLogger()
3232

3333
type Entry struct {
3434
TMS *topology2.TMS

integration/nwo/token/generators/dlog/dlog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func IsAries(tms *topology.TMS) bool {
4646
return false
4747
}
4848

49-
var logger = logging.MustGetLogger("token-sdk.integration.token.generators.dlog")
49+
var logger = logging.MustGetLogger()
5050

5151
type CryptoMaterialGenerator struct {
5252
FabTokenGenerator *fabtoken.CryptoMaterialGenerator

integration/nwo/token/generators/fabtoken/fabtoken.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ PeerOrgs:{{ range .PeerOrgs }}
7171
`
7272
)
7373

74-
var logger = logging.MustGetLogger("token-sdk.integration.token.generators.fabtoken")
74+
var logger = logging.MustGetLogger()
7575

7676
type Peer struct {
7777
Name string

integration/nwo/token/orion/orion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"gopkg.in/yaml.v2"
3939
)
4040

41-
var logger = logging.MustGetLogger("token-sdk.integration.token.orion")
41+
var logger = logging.MustGetLogger()
4242

4343
type Entry struct {
4444
TMS *topology2.TMS

integration/nwo/token/platform.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737
DefaultTokenGenPath = "github.com/hyperledger-labs/fabric-token-sdk/cmd/tokengen"
3838
)
3939

40-
var logger = logging.MustGetLogger("token-sdk.integration.token")
40+
var logger = logging.MustGetLogger()
4141

4242
type PF interface {
4343
GetTopology() *Topology

integration/nwo/txgen/executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func NewSuiteExecutor(userProviderConfig model.UserProviderConfig, intermediaryC
3030
c := dig.New()
3131

3232
err := errors.Join(
33-
c.Provide(func() logging.Logger { return logging.MustGetLogger("client") }),
33+
c.Provide(func() logging.Logger { return logging.MustGetLogger() }),
3434
c.Provide(func() model.IntermediaryConfig { return intermediaryConfig }),
3535
c.Provide(func() model.UserProviderConfig { return userProviderConfig }),
3636
c.Provide(metrics.NewProvider),

integration/nwo/txgen/service/logging/logger.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ SPDX-License-Identifier: Apache-2.0
77
package logging
88

99
import (
10-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
11+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1112
)
1213

1314
type Logger = logging.Logger
1415

1516
// MustGetLogger Get a logger.
16-
func MustGetLogger(name string) Logger {
17-
return logging.MustGetLogger(name)
17+
func MustGetLogger(params ...string) Logger {
18+
return utils.MustGet(GetLogger(params...))
19+
}
20+
21+
func GetLogger(params ...string) (Logger, error) {
22+
return logging.GetLoggerWithReplacements(map[string]string{"github.com.hyperledger-labs.fabric-token-sdk.integration": "fts"}, params)
1823
}

integration/token/fungible/views/logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ package views
88

99
import "github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
1010

11-
var logger = logging.MustGetLogger("token-sdk.fungible.views")
11+
var logger = logging.MustGetLogger()

0 commit comments

Comments
 (0)