Skip to content

Commit ea8fcd6

Browse files
adecaroadecaro
committed
move to "github.com/hyperledger/fabric-lib-go/common/flogging"
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent f76ae15 commit ea8fcd6

File tree

144 files changed

+364
-4170
lines changed

Some content is hidden

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

144 files changed

+364
-4170
lines changed

‎docs/fabric/fabricdev/core/fabricdev/driver/provider.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/hyperledger-labs/fabric-smart-client/docs/fabric/fabricdev/core/fabricdev"
1616
"github.com/hyperledger-labs/fabric-smart-client/docs/fabric/fabricdev/core/fabricdev/transaction"
1717
"github.com/hyperledger-labs/fabric-smart-client/docs/fabric/fabricdev/core/fabricdev/vault"
18+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1819
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic"
1920
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/committer"
2021
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/driver/config"
@@ -26,14 +27,13 @@ import (
2627
vdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
2728
dbdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
2829
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/events"
29-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
3030
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
3131
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
3232
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
3333
"go.opentelemetry.io/otel/trace"
3434
)
3535

36-
var logger = flogging.MustGetLogger("fabric-sdk.core.generic.driver")
36+
var logger = logging.MustGetLogger("fabric-sdk.core.generic.driver")
3737

3838
type Provider struct {
3939
configProvider config.Provider

‎docs/fabric/fabricdev/core/fabricdev/vault/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ SPDX-License-Identifier: Apache-2.0
77
package vault
88

99
import (
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1011
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault"
1112
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/vault/txidstore"
1213
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
1314
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/cache/secondcache"
1415
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db"
1516
dbdriver "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
16-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
1717
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
1818
"github.com/pkg/errors"
1919
"go.opentelemetry.io/otel/trace"
2020
)
2121

22-
var logger = flogging.MustGetLogger("fabric-sdk.core.vault")
22+
var logger = logging.MustGetLogger("fabric-sdk.core.vault")
2323

2424
func New(configService driver.ConfigService, channel string, drivers []dbdriver.NamedDriver, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) (*Vault, driver.TXIDStore, error) {
2525
var d dbdriver.Driver

‎docs/fabric/fabricdev/core/fabricdev/vault/vault.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/vault"
1111
"github.com/hyperledger-labs/fabric-smart-client/platform/common/core/generic/vault/txidstore"
1212
"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
13+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1314
fdriver "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/driver"
14-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
1515
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
1616
"go.opentelemetry.io/otel/trace"
1717
)
@@ -26,7 +26,7 @@ type (
2626
// NewVault returns a new instance of Vault
2727
func NewVault(store vault.VersionedPersistence, txIDStore TXIDStore, metricsProvider metrics.Provider, tracerProvider trace.TracerProvider) *Vault {
2828
return vault.New[fdriver.ValidationCode](
29-
flogging.MustGetLogger("fabric-sdk.generic.vault"),
29+
logging.MustGetLogger("fabric-sdk.generic.vault"),
3030
store,
3131
txIDStore,
3232
&fdriver.ValidationCodeProvider{},

‎integration/fabric/events/chaincode/views/events.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"sync"
1313
"time"
1414

15+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1516
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/chaincode"
1617
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/assert"
17-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
1818
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1919
"github.com/pkg/errors"
2020
)
2121

22-
var logger = flogging.MustGetLogger("view-events")
22+
var logger = logging.MustGetLogger("view-events")
2323

2424
type EventsView struct {
2525
*Events

‎integration/fabric/iou/commands.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
"github.com/hyperledger-labs/fabric-smart-client/integration"
1616
"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/iou/views"
1717
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
18-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
18+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1919
. "github.com/onsi/gomega"
2020
"github.com/prometheus/common/model"
2121
)
2222

23-
var logger = flogging.MustGetLogger("iou-test")
23+
var logger = logging.MustGetLogger("iou-test")
2424

2525
func CreateIOU(ii *integration.Infrastructure, identityLabel string, amount uint, approver string) string {
2626
return CreateIOUWithBorrower(ii, "borrower", identityLabel, amount, approver)

‎integration/fabric/iou/views/utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"time"
1313

1414
"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
15+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1516
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric"
16-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
1717
)
1818

19-
var logger = flogging.MustGetLogger("fabric.iou")
19+
var logger = logging.MustGetLogger("fabric.iou")
2020

2121
type FinalityListener struct {
2222
ExpectedTxID string

‎integration/integration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/monitoring"
2727
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/orion"
2828
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/weaver"
29-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
29+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
3030
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
3131
"github.com/onsi/ginkgo/v2"
3232
. "github.com/onsi/gomega"
3333
)
3434

35-
var logger = flogging.MustGetLogger("fsc.integration")
35+
var logger = logging.MustGetLogger("fsc.integration")
3636

3737
type Configuration struct {
3838
StartPort int

‎integration/nwo/cmd/network/cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/hyperledger-labs/fabric-smart-client/integration"
1313
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
14-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
14+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1515
"github.com/pkg/errors"
1616
"github.com/spf13/cobra"
1717
)
@@ -24,7 +24,7 @@ type (
2424
)
2525

2626
var (
27-
logger = flogging.MustGetLogger("nwo.network")
27+
logger = logging.MustGetLogger("nwo.network")
2828

2929
path string
3030
topology string

‎integration/nwo/common/builder.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616
"sync"
1717
"time"
1818

19-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
19+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
2020
. "github.com/onsi/gomega"
2121
"github.com/onsi/gomega/gexec"
2222
)
2323

24-
var logger = flogging.MustGetLogger("nwo.builder")
24+
var logger = logging.MustGetLogger("nwo.builder")
2525

2626
type BuilderClient struct {
2727
ServerAddress string `json:"server_address"`

‎integration/nwo/common/context/context.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package context
88

99
import (
1010
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
11+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
1112
view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/client/view"
12-
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
1313
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
1414
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
1515
)
1616

17-
var logger = flogging.MustGetLogger("fsc.integration")
17+
var logger = logging.MustGetLogger("fsc.integration")
1818

1919
type Builder interface {
2020
Build(path string) string

0 commit comments

Comments
 (0)