Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
713f2881
Unverified
Commit
713f2881
authored
Mar 07, 2024
by
felipe
Committed by
GitHub
Mar 08, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(proxyd): log initialization (#9785)
* fix(proxyd): log initialization * update integration test as well
parent
f1db7939
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
main.go
proxyd/cmd/proxyd/main.go
+2
-2
util_test.go
proxyd/integration_tests/util_test.go
+2
-2
No files found.
proxyd/cmd/proxyd/main.go
View file @
713f2881
...
@@ -28,7 +28,7 @@ var (
...
@@ -28,7 +28,7 @@ var (
func
main
()
{
func
main
()
{
// Set up logger with a default INFO level in case we fail to parse flags.
// Set up logger with a default INFO level in case we fail to parse flags.
// Otherwise the final critical log won't show what the parsing error was.
// Otherwise the final critical log won't show what the parsing error was.
slog
.
SetDefault
(
slog
.
New
(
slog
.
NewJSONHandler
(
log
.
SetDefault
(
log
.
NewLogger
(
slog
.
NewJSONHandler
(
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
slog
.
LevelInfo
})))
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
slog
.
LevelInfo
})))
log
.
Info
(
"starting proxyd"
,
"version"
,
GitVersion
,
"commit"
,
GitCommit
,
"date"
,
GitDate
)
log
.
Info
(
"starting proxyd"
,
"version"
,
GitVersion
,
"commit"
,
GitCommit
,
"date"
,
GitDate
)
...
@@ -50,7 +50,7 @@ func main() {
...
@@ -50,7 +50,7 @@ func main() {
log
.
Warn
(
"invalid server.log_level set: "
+
config
.
Server
.
LogLevel
)
log
.
Warn
(
"invalid server.log_level set: "
+
config
.
Server
.
LogLevel
)
}
}
}
}
slog
.
SetDefault
(
slog
.
New
(
slog
.
NewJSONHandler
(
log
.
SetDefault
(
log
.
NewLogger
(
slog
.
NewJSONHandler
(
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
logLevel
})))
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
logLevel
})))
if
config
.
Server
.
EnablePprof
{
if
config
.
Server
.
EnablePprof
{
...
...
proxyd/integration_tests/util_test.go
View file @
713f2881
...
@@ -186,6 +186,6 @@ func (h *ProxydWSClient) WriteControlMessage(msgType int, msg []byte) error {
...
@@ -186,6 +186,6 @@ func (h *ProxydWSClient) WriteControlMessage(msgType int, msg []byte) error {
}
}
func
InitLogger
()
{
func
InitLogger
()
{
slog
.
SetDefault
(
slog
.
New
(
log
.
SetDefault
(
log
.
NewLogger
(
slog
.
NewJSONHandler
(
log
.
NewTerminalHandlerWithLevel
(
os
.
Stdout
,
slog
.
LevelDebug
,
false
)))
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
slog
.
LevelDebug
}
)))
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment