Skip to content

Commit b5a27f0

Browse files
committed
chore: upgraded dependencies
1 parent e7e623a commit b5a27f0

File tree

5 files changed

+48
-46
lines changed

5 files changed

+48
-46
lines changed

cloud/gcloud/logger.go

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,54 @@ package gcloud
22

33
import (
44
gologger "github.com/ralvarezdev/go-logger"
5-
gologgerstatus "github.com/ralvarezdev/go-logger/status"
5+
gologgermode "github.com/ralvarezdev/go-logger/mode"
6+
gologgermodenamed "github.com/ralvarezdev/go-logger/mode/named"
67
"google.golang.org/grpc/credentials/oauth"
78
)
89

910
// Logger is the logger for Google Cloud
1011
type Logger struct {
11-
logger gologger.Logger
12+
logger gologgermodenamed.Logger
1213
}
1314

1415
// NewLogger is the logger for Google Cloud
15-
func NewLogger(logger gologger.Logger) (*Logger, error) {
16+
func NewLogger(header string, modeLogger gologgermode.Logger) (*Logger, error) {
1617
// Check if the logger is nil
17-
if logger == nil {
18+
if modeLogger == nil {
1819
return nil, gologger.ErrNilLogger
1920
}
2021

21-
return &Logger{logger: logger}, nil
22+
// Initialize the mode named logger
23+
namedLogger, _ := gologgermodenamed.NewDefaultLogger(header, modeLogger)
24+
25+
return &Logger{logger: namedLogger}, nil
26+
}
27+
28+
// FailedToLoadTokenSource logs the failed to load token source
29+
func (l *Logger) FailedToLoadTokenSource(err error) {
30+
l.logger.Error(
31+
"failed to load token source",
32+
err,
33+
)
2234
}
2335

2436
// LoadedTokenSource logs the loaded token source
2537
func (l *Logger) LoadedTokenSource(tokenSource *oauth.TokenSource) {
2638
// Check if the token source is nil
2739
if tokenSource == nil {
28-
l.logger.LogError(
29-
gologger.NewLogError(
30-
"failed to load token source",
31-
ErrNilTokenSource,
32-
),
33-
)
40+
l.FailedToLoadTokenSource(ErrNilTokenSource)
3441
return
3542
}
3643

3744
// Get the access token from the token source
3845
token, err := tokenSource.Token()
3946
if err != nil {
40-
l.logger.LogError(
41-
gologger.NewLogError(
42-
"failed to load token source",
43-
err,
44-
),
45-
)
47+
l.FailedToLoadTokenSource(err)
4648
return
4749
}
4850

49-
l.logger.LogMessage(
50-
gologger.NewLogMessage(
51-
"loaded token source",
52-
gologgerstatus.Debug,
53-
token.AccessToken,
54-
),
51+
l.logger.Debug(
52+
"loaded token source",
53+
token.AccessToken,
5554
)
5655
}

env/logger.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,32 @@ package env
22

33
import (
44
gologger "github.com/ralvarezdev/go-logger"
5-
gologgerstatus "github.com/ralvarezdev/go-logger/status"
5+
gologgermode "github.com/ralvarezdev/go-logger/mode"
6+
gologgermodenamed "github.com/ralvarezdev/go-logger/mode/named"
67
)
78

89
// Logger is the environment logger
910
type Logger struct {
10-
logger gologger.Logger
11+
logger gologgermodenamed.Logger
1112
}
1213

1314
// NewLogger creates a new environment logger
14-
func NewLogger(logger gologger.Logger) (*Logger, error) {
15+
func NewLogger(header string, modeLogger gologgermode.Logger) (*Logger, error) {
1516
// Check if the logger is nil
16-
if logger == nil {
17+
if modeLogger == nil {
1718
return nil, gologger.ErrNilLogger
1819
}
1920

20-
return &Logger{logger: logger}, nil
21+
// Initialize the mode named logger
22+
namedLogger, _ := gologgermodenamed.NewDefaultLogger(header, modeLogger)
23+
24+
return &Logger{logger: namedLogger}, nil
2125
}
2226

2327
// EnvironmentVariableLoaded logs a message when an environment variable is loaded
2428
func (l *Logger) EnvironmentVariableLoaded(variablesName ...string) {
25-
l.logger.LogMessage(
26-
gologger.NewLogMessage(
27-
"environment variable loaded",
28-
gologgerstatus.Debug,
29-
variablesName...,
30-
),
29+
l.logger.Debug(
30+
"environment variable loaded",
31+
variablesName...,
3132
)
3233
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/ralvarezdev/go-loader
33
go 1.23.4
44

55
require (
6-
github.com/ralvarezdev/go-logger v0.3.0
6+
github.com/ralvarezdev/go-logger v0.4.3
77
golang.org/x/oauth2 v0.25.0
88
google.golang.org/api v0.214.0
99
google.golang.org/grpc v1.69.2

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
3030
github.com/ralvarezdev/go-logger v0.2.2 h1:j58spza2L6s+vAibifHSuUPrXm0+6nWZWR3SOg8ihBk=
3131
github.com/ralvarezdev/go-logger v0.2.2/go.mod h1:v5OvFrkS+wsYNTCVegXWiRhBtcYrQJr4LDMDntvpAos=
3232
github.com/ralvarezdev/go-logger v0.3.0/go.mod h1:v5OvFrkS+wsYNTCVegXWiRhBtcYrQJr4LDMDntvpAos=
33+
github.com/ralvarezdev/go-logger v0.4.3/go.mod h1:IUxZUO1YOByDagoOfFnmz2EHD30Z9TPufXrkDlucWTM=
3334
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
3435
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3536
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=

http/listener/logger.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,32 @@ package listener
22

33
import (
44
gologger "github.com/ralvarezdev/go-logger"
5-
gologgerstatus "github.com/ralvarezdev/go-logger/status"
5+
gologgermode "github.com/ralvarezdev/go-logger/mode"
6+
gologgermodenamed "github.com/ralvarezdev/go-logger/mode/named"
67
)
78

89
// Logger is the logger for the listener
910
type Logger struct {
10-
logger gologger.Logger
11+
logger gologgermodenamed.Logger
1112
}
1213

1314
// NewLogger creates a new listener logger
14-
func NewLogger(logger gologger.Logger) (*Logger, error) {
15+
func NewLogger(header string, modeLogger gologgermode.Logger) (*Logger, error) {
1516
// Check if the logger is nil
16-
if logger == nil {
17+
if modeLogger == nil {
1718
return nil, gologger.ErrNilLogger
1819
}
1920

20-
return &Logger{logger: logger}, nil
21+
// Initialize the mode named logger
22+
namedLogger, _ := gologgermodenamed.NewDefaultLogger(header, modeLogger)
23+
24+
return &Logger{logger: namedLogger}, nil
2125
}
2226

2327
// ServerStarted logs a success message when the server starts
2428
func (l *Logger) ServerStarted(port string) {
25-
l.logger.LogMessage(
26-
gologger.NewLogMessage(
27-
"server started",
28-
gologgerstatus.Debug,
29-
port,
30-
),
29+
l.logger.Info(
30+
"server started",
31+
"port: "+port,
3132
)
3233
}

0 commit comments

Comments
 (0)