Skip to content

Follow up: add log prefix #2293

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
cedric-cordenier wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

Follow up: add log prefix #2293

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
2 changes: 1 addition & 1 deletion pkg/workflows/wasm/host/logging_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestLogRawMessage_PanicAndFatalLevelsDoNotCrashHost(t *testing.T) {
entries := logs.All()
require.Len(t, entries, 1)
require.Equal(t, zapcore.ErrorLevel, entries[0].Level)
require.Equal(t, "boom", entries[0].Message)
require.Equal(t, "["+level+"] boom", entries[0].Message)
})
Comment on lines 28 to 32
}
}
7 changes: 5 additions & 2 deletions pkg/workflows/wasm/host/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,9 +1078,12 @@ func logRawMessage(logger logger.Logger, b []byte) error {
logger.Warnw(sanitizedMsg, args...)
case "error":
logger.Errorw(sanitizedMsg, args...)
case "panic", "fatal":
case "panic":
// The guest should never be able to panic/exit the host
logger.Errorw(sanitizedMsg, args...)
logger.Errorw("[panic] "+sanitizedMsg, args...)
case "fatal":
// The guest should never be able to panic/exit the host
logger.Errorw("[fatal] "+sanitizedMsg, args...)
Comment on lines +1081 to +1086
default:
logger.Infow(sanitizedMsg, args...)
}
Expand Down
Loading