Skip to content

Commit

Permalink
INS-1551: delete all *ln functions from logger
Browse files Browse the repository at this point in the history
  • Loading branch information
ruz committed Feb 20, 2019
1 parent 47f4aaa commit 0086323
Show file tree
Hide file tree
Showing 21 changed files with 71 additions and 135 deletions.
2 changes: 1 addition & 1 deletion api/requester/requester.go
Expand Up @@ -66,7 +66,7 @@ var scheme = platformpolicy.NewPlatformCryptographyScheme()

func verboseInfo(ctx context.Context, msg string) {
if verbose {
inslogger.FromContext(ctx).Infoln(msg)
inslogger.FromContext(ctx).Info(msg)
}
}

Expand Down
6 changes: 3 additions & 3 deletions cmd/healthcheck/healthcheck.go
Expand Up @@ -36,13 +36,13 @@ func main() {
pflag.Parse()

if *rpcAddress == "" || *rpcProtocol == "" || *refString == "" {
log.Errorln(errors.New("need to provide all params"))
log.Error(errors.New("need to provide all params"))
os.Exit(2)
}

client, err := rpc.Dial(*rpcProtocol, *rpcAddress)
if err != nil {
log.Errorln(err.Error())
log.Error(err.Error())
os.Exit(2)
}

Expand All @@ -66,7 +66,7 @@ func main() {

err = client.Call("RPC.CallMethod", req, &res)
if err != nil {
log.Errorln(err.Error())
log.Error(err.Error())
os.Exit(2)
}
}
2 changes: 1 addition & 1 deletion cmd/insolar/main.go
Expand Up @@ -118,7 +118,7 @@ func parseInputParams() {

func verboseInfo(msg string) {
if verbose {
log.Infoln(msg)
log.Info(msg)
}
}

Expand Down
10 changes: 5 additions & 5 deletions cmd/insolard/main.go
Expand Up @@ -24,12 +24,12 @@ import (
"os/signal"
"syscall"

"github.com/insolar/insolar/core/utils"
"github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman"

"github.com/insolar/insolar/configuration"
"github.com/insolar/insolar/core"
"github.com/insolar/insolar/core/utils"
"github.com/insolar/insolar/instrumentation/inslogger"
"github.com/insolar/insolar/instrumentation/instracer"
"github.com/insolar/insolar/log"
Expand Down Expand Up @@ -83,12 +83,12 @@ func main() {
err = cfgHolder.Load()
}
if err != nil {
log.Warnln("failed to load configuration from file: ", err.Error())
log.Warn("failed to load configuration from file: ", err.Error())
}

err = cfgHolder.LoadEnv()
if err != nil {
log.Warnln("failed to load configuration from env:", err.Error())
log.Warn("failed to load configuration from env:", err.Error())
}

cfg := &cfgHolder.Configuration
Expand Down Expand Up @@ -159,7 +159,7 @@ func main() {

go func() {
sig := <-gracefulStop
inslog.Debugln("caught sig: ", sig)
inslog.Debug("caught sig: ", sig)

inslog.Warn("GRACEFULL STOP APP")
err = cm.Stop(ctx)
Expand All @@ -181,7 +181,7 @@ func initLogger(ctx context.Context, cfg configuration.Log, traceid string) (con
}
err = inslog.SetLevel(cfg.Level)
if err != nil {
inslog.Errorln(err.Error())
inslog.Error(err.Error())
}
return inslogger.WithTraceField(inslogger.SetLogger(ctx, inslog), traceid)
}
Expand Down
13 changes: 7 additions & 6 deletions cmd/pulsard/main.go
Expand Up @@ -25,6 +25,9 @@ import (
"syscall"
"time"

"github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman"

"github.com/insolar/insolar/component"
"github.com/insolar/insolar/configuration"
"github.com/insolar/insolar/core"
Expand All @@ -40,10 +43,8 @@ import (
"github.com/insolar/insolar/platformpolicy"
"github.com/insolar/insolar/pulsar"
"github.com/insolar/insolar/pulsar/entropygenerator"
pulsarstorage "github.com/insolar/insolar/pulsar/storage"
"github.com/insolar/insolar/pulsar/storage"
"github.com/insolar/insolar/version"
"github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman"
)

type inputParams struct {
Expand Down Expand Up @@ -77,12 +78,12 @@ func main() {
err = cfgHolder.Load()
}
if err != nil {
log.Warnln("failed to load configuration from file: ", err.Error())
log.Warn("failed to load configuration from file: ", err.Error())
}

err = cfgHolder.LoadEnv()
if err != nil {
log.Warnln("failed to load configuration from env:", err.Error())
log.Warn("failed to load configuration from env:", err.Error())
}

traceID := utils.RandTraceID()
Expand Down Expand Up @@ -231,7 +232,7 @@ func initLogger(ctx context.Context, cfg configuration.Log, traceid string) (con
}
err = inslog.SetLevel(cfg.Level)
if err != nil {
inslog.Errorln(err.Error())
inslog.Error(err.Error())
}
return inslogger.WithTraceField(inslogger.SetLogger(ctx, inslog), traceid)
}
9 changes: 5 additions & 4 deletions component/manager.go
Expand Up @@ -21,8 +21,9 @@ import (
"fmt"
"reflect"

"github.com/insolar/insolar/log"
"github.com/pkg/errors"

"github.com/insolar/insolar/log"
)

// Manager provide methods to manage components lifecycle
Expand Down Expand Up @@ -124,7 +125,7 @@ func (m *Manager) Start(ctx context.Context) error {
}
name := reflect.TypeOf(c).Elem().String()
if s, ok := c.(Starter); ok {
log.Debugln("ComponentManager: Start component: ", name)
log.Debug("ComponentManager: Start component: ", name)
err := s.Start(ctx)
if err != nil {
return errors.Wrap(err, "Failed to start components.")
Expand All @@ -149,7 +150,7 @@ func (m *Manager) Init(ctx context.Context) error {
log.Debugf("ComponentManager: Component %s has no Init method", name)
continue
}
log.Debugln("ComponentManager: Init component: ", name)
log.Debug("ComponentManager: Init component: ", name)
err := s.Init(ctx)
if err != nil {
return errors.Wrap(err, "Failed to init components.")
Expand All @@ -167,7 +168,7 @@ func (m *Manager) Stop(ctx context.Context) error {
}
name := reflect.TypeOf(m.components[i]).Elem().String()
if s, ok := m.components[i].(Stopper); ok {
log.Debugln("ComponentManager: Stop component: ", name)
log.Debug("ComponentManager: Stop component: ", name)

err := s.Stop(ctx)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion consensus/packets/init.go
Expand Up @@ -37,7 +37,7 @@ func init() {
sizeOf := func(s Serializer) uint16 {
data, err := s.Serialize()
if err != nil {
log.Fatalln("Failed to init packets package: ", err.Error())
log.Fatal("Failed to init packets package: ", err.Error())
}
return uint16(len(data))
}
Expand Down
17 changes: 9 additions & 8 deletions consensus/phases/communicator.go
Expand Up @@ -21,6 +21,11 @@ import (
"context"
"sync/atomic"

"github.com/pkg/errors"
"go.opencensus.io/stats"
"go.opencensus.io/tag"
"go.opencensus.io/trace"

"github.com/insolar/insolar/component"
"github.com/insolar/insolar/consensus"
"github.com/insolar/insolar/consensus/packets"
Expand All @@ -29,10 +34,6 @@ import (
"github.com/insolar/insolar/instrumentation/instracer"
"github.com/insolar/insolar/log"
"github.com/insolar/insolar/network"
"github.com/pkg/errors"
"go.opencensus.io/stats"
"go.opencensus.io/tag"
"go.opencensus.io/trace"
)

// Communicator interface provides methods to exchange data between nodes
Expand Down Expand Up @@ -556,14 +557,14 @@ func (nc *ConsensusCommunicator) ExchangePhase3(ctx context.Context, participant
func (nc *ConsensusCommunicator) phase1DataHandler(packet packets.ConsensusPacket, sender core.RecordRef) {
p, ok := packet.(*packets.Phase1Packet)
if !ok {
log.Errorln("invalid Phase1Packet")
log.Error("invalid Phase1Packet")
return
}

newPulse := p.GetPulse()

if newPulse.PulseNumber < nc.getPulseNumber() {
log.Warnln("ignore old pulse Phase1Packet")
log.Warn("ignore old pulse Phase1Packet")
return
}

Expand All @@ -577,14 +578,14 @@ func (nc *ConsensusCommunicator) phase1DataHandler(packet packets.ConsensusPacke
func (nc *ConsensusCommunicator) phase2DataHandler(packet packets.ConsensusPacket, sender core.RecordRef) {
p, ok := packet.(*packets.Phase2Packet)
if !ok {
log.Errorln("invalid Phase2Packet")
log.Error("invalid Phase2Packet")
return
}

pulseNumber := p.GetPulseNumber()

if pulseNumber < nc.getPulseNumber() {
log.Warnln("ignore old pulse Phase2Packet")
log.Warn("ignore old pulse Phase2Packet")
return
}

Expand Down
16 changes: 2 additions & 14 deletions core/logger.go
Expand Up @@ -27,43 +27,31 @@ type Logger interface {

// Debug logs a message at level Debug.
Debug(...interface{})
// Debugln logs a message at level Debug.
Debugln(...interface{})
// Debugf formatted logs a message at level Debug.
Debugf(string, ...interface{})

// Info logs a message at level Info.
Info(...interface{})
// Infoln logs a message at level Info.
Infoln(...interface{})
// Infof formatted logs a message at level Info.
Infof(string, ...interface{})

// Warn logs a message at level Warn.
Warn(...interface{})
// Warnln logs a message at level Warn.
Warnln(...interface{})
// Warnf formatted logs a message at level Warn.
// Warnf logs a message at level Warn.
Warnf(string, ...interface{})

// Error logs a message at level Error.
Error(...interface{})
// Errorln logs a message at level Error.
Errorln(...interface{})
// Errorf formatted logs a message at level Error.
// Errorf logs a message at level Error.
Errorf(string, ...interface{})

// Fatal logs a message at level Fatal and than call os.exit().
Fatal(...interface{})
// Fatalln logs a message at level Fatal and than call os.exit().
Fatalln(...interface{})
// Fatalf formatted logs a message at level Fatal and than call os.exit().
Fatalf(string, ...interface{})

// Panic logs a message at level Panic and than call panic().
Panic(...interface{})
// Panicln logs a message at level Panic and than call panic().
Panicln(...interface{})
// Panicf formatted logs a message at level Panic and than call panic().
Panicf(string, ...interface{})

Expand Down
6 changes: 3 additions & 3 deletions ledger/artifactmanager/handler.go
Expand Up @@ -320,7 +320,7 @@ func (h *MessageHandler) handleSetRecord(ctx context.Context, parcel core.Parcel

id, err := h.ObjectStorage.SetRecord(ctx, jetID, parcel.Pulse(), rec)
if err == storage.ErrOverride {
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warnln("set record override")
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warn("set record override")
} else if err != nil {
return nil, err
}
Expand Down Expand Up @@ -812,7 +812,7 @@ func (h *MessageHandler) handleUpdateObject(ctx context.Context, parcel core.Par

id, err := tx.SetRecord(ctx, jetID, parcel.Pulse(), rec)
if err == storage.ErrOverride {
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warnln("set record override (#1)")
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warn("set record override (#1)")
} else if err != nil {
return err
}
Expand Down Expand Up @@ -884,7 +884,7 @@ func (h *MessageHandler) handleRegisterChild(ctx context.Context, parcel core.Pa

child, err = tx.SetRecord(ctx, jetID, parcel.Pulse(), childRec)
if err == storage.ErrOverride {
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warnln("set record override (#2)")
inslogger.FromContext(ctx).WithField("type", fmt.Sprintf("%T", rec)).Warn("set record override (#2)")
} else if err != nil {
return err
}
Expand Down
16 changes: 8 additions & 8 deletions ledger/storage/dropstorage_test.go
Expand Up @@ -22,17 +22,17 @@ import (
"testing"
"time"

"github.com/insolar/insolar/component"
"github.com/insolar/insolar/platformpolicy"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

"github.com/insolar/insolar/component"
"github.com/insolar/insolar/core"
"github.com/insolar/insolar/instrumentation/inslogger"
"github.com/insolar/insolar/ledger/storage"
"github.com/insolar/insolar/ledger/storage/storagetest"
"github.com/insolar/insolar/log"
"github.com/insolar/insolar/platformpolicy"
)

type dropSuite struct {
Expand Down Expand Up @@ -113,34 +113,34 @@ func (s *dropSuite) TestStore_DropWaitWrites() {
var err error
go func() {
err = s.db.Update(s.ctx, func(tx *storage.TransactionManager) error {
log.Debugln("start tx")
log.Debug("start tx")
close(txstarted)
<-dropwaits
time.Sleep(waittime)
txFin = time.Now()
return nil
})
log.Debugln("end tx")
log.Debug("end tx")
wg.Done()
}()

go func() {
<-txstarted
log.Debugln("start CreateDrop")
log.Debug("start CreateDrop")
close(dropwaits)
_, _, dropSize, droperr := s.dropStorage.CreateDrop(s.ctx, core.TODOJetID, 0, []byte{})
if droperr != nil {
panic(droperr)
}
require.NotEqual(s.T(), 0, dropSize)
dropFin = time.Now()
log.Debugln("end CreateDrop")
log.Debug("end CreateDrop")
wg.Done()
}()
wg.Wait()

log.Debugln("R: tx end t:", txFin)
log.Debugln("R: drop t:", dropFin)
log.Debug("R: tx end t:", txFin)
log.Debug("R: drop t:", dropFin)

require.NoError(s.T(), err)
assert.Conditionf(s.T(), func() bool {
Expand Down

0 comments on commit 0086323

Please sign in to comment.