Skip to content

#769 issue updated and comment is errased #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#769 issue updated and comment is errased #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion broker/channel/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/meshery/meshkit/broker"
"github.com/meshery/meshkit/logger"
"github.com/meshery/meshkit/utils"
"github.com/sirupsen/logrus"
)

type ChannelBrokerHandler struct {
Expand All @@ -35,7 +36,7 @@ func NewChannelBrokerHandler(optsSetters ...OptionsSetter) *ChannelBrokerHandler
var err error
log, err = logger.New("channel-broker", logger.Options{
Format: logger.TerminalLogFormat,
LogLevel: 4, // Info level
LogLevel: int(logrus.InfoLevel),
})
if err != nil {
// Fallback to a simple logger if creation fails
Expand Down
5 changes: 3 additions & 2 deletions broker/nats/nats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/meshery/meshkit/broker"
"github.com/meshery/meshkit/logger"
nats "github.com/nats-io/nats.go"
"github.com/sirupsen/logrus"
)

var (
Expand Down Expand Up @@ -98,7 +99,7 @@ func New(opts Options) (broker.Handler, error) {
var lerr error
lg, lerr = logger.New("nats-handler", logger.Options{
Format: logger.TerminalLogFormat,
LogLevel: 4, // Info
LogLevel: int(logrus.InfoLevel),
})
if lerr != nil {
// fallback to nil; we'll use std log where necessary
Expand Down Expand Up @@ -277,4 +278,4 @@ func (in *Nats) IsEmpty() bool {
return true
}
return in.nc == nil && in.wg == nil && in.ctx == nil && in.cancel == nil
}
}