php/archived-frankenphp
1
0
Fork 0
mirror of https://github.com/php/frankenphp.git synced 2026-03-24 00:52:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash when using the logger outside of the a request context

Browse Source
This commit is contained in:
Kévin Dunglas
2025-12-19 16:22:06 +01:00
parent 75ccccf1b2
commit 380fd702dc
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frankenphp.go
View File

@@ -660,10 +660,23 @@ func go_read_cookies(threadIndex C.uintptr_t) *C.char {
return C.CString(cookie)
}
func getLogger(threadIndex C.uintptr_t) (*slog.Logger, context.Context) {
ctxHolder := phpThreads[threadIndex]
if ctxHolder == nil {
return globalLogger, globalCtx
}
fCtx := ctxHolder.frankenPHPContext()
if fCtx == nil {
return globalLogger, globalCtx
}
return fCtx.logger, ctxHolder.context()
}
//export go_log
func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
ctx := phpThreads[threadIndex].context()
logger := phpThreads[threadIndex].frankenPHPContext().logger
logger, ctx := getLogger(threadIndex)
m := C.GoString(message)
le := syslogLevelInfo
@@ -697,8 +710,7 @@ func go_log(threadIndex C.uintptr_t, message *C.char, level C.int) {
//export go_log_attrs
func go_log_attrs(threadIndex C.uintptr_t, message *C.zend_string, cLevel C.zend_long, cAttrs *C.zval) *C.char {
ctx := phpThreads[threadIndex].context()
logger := phpThreads[threadIndex].frankenPHPContext().logger
logger, ctx := getLogger(threadIndex)
level := slog.Level(cLevel)