simplify

Author: dunglas

frankenphp.go

@@ -694,27 +694,26 @@ 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, level C.zend_long, cattrs *C.zval) *C.char {
+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()
+
+	level := slog.Level(cLevel)
+
+	if !globalLogger.Enabled(ctx, level) {
+		return nil
+	}
+
 	var attrs map[string]any
 
-	if cattrs == nil {
-		attrs = nil
-	} else {
+	if cAttrs != nil {
 		var err error
-		if attrs, err = GoMap[any](unsafe.Pointer(cattrs)); err != nil {
-			// NOTE: return value is already formatted for a PHP exception message.
+		if attrs, err = GoMap[any](unsafe.Pointer(cAttrs)); err != nil {
+			// PHP exception message.
 			return C.CString("Failed to log message: converting attrs: " + err.Error())
 		}
 	}
 
-	ctx := phpThreads[threadIndex].context()
-
-	if globalLogger.Enabled(ctx, slog.Level(level)) {
-		globalLogger.LogAttrs(ctx,
-			slog.Level(level),
-			GoString(unsafe.Pointer(message)),
-			mapToAttr(attrs)...)
-	}
+	globalLogger.LogAttrs(ctx, level, GoString(unsafe.Pointer(message)), mapToAttr(attrs)...)
 
 	return nil
 }

frankenphp_test.go

@@ -425,7 +425,7 @@ my_autoloader`, i), body)
 
 func TestLog_module(t *testing.T) { testLog(t, &testOptions{}) }
 func TestLog_worker(t *testing.T) {
-	testLog(t, &testOptions{workerScript: "log.php"})
+	testLog(t, &testOptions{workerScript: "log-error_log.php"})
 }
 func testLog(t *testing.T, opts *testOptions) {
 	logger, logs := observer.New(zapcore.InfoLevel)
@@ -1064,22 +1064,18 @@ func FuzzRequest(f *testing.F) {
 
 func TestFrankenPHPLog(t *testing.T) {
 	var buf bytes.Buffer
-	handler := slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelDebug})
-	logger := slog.New(handler)
 
 	runTest(t, func(handler func(http.ResponseWriter, *http.Request), _ *httptest.Server, _ int) {
-		body, _ := testGet("http://example.com/log_to_slog.php", handler, t)
+		body, _ := testGet("http://example.com/log-frankenphp_log.php", handler, t)
 		assert.Empty(t, body)
 	}, &testOptions{
-		logger:             logger,
+		logger:             slog.New(slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelDebug})),
 		nbParallelRequests: 1,
 		nbWorkers:          1,
 	})
 
 	logOutput := buf.String()
 
-	t.Logf("captured log output: %s", logOutput)
-
 	for level, needle := range map[string]string{
 		"debug attrs": `level=DEBUG msg="some debug message" "key int"=1`,
 		"info attrs":  `level=INFO msg="some info message" "key string"=string`,

testdata/log.php testdata/log-error_log.phptestdata/log.php renamed to testdata/log-error_log.php

@@ -0,0 +1,15 @@
+<?php
+
+frankenphp_log("some debug message", -4, [
+    "key int"    => 1,
+]);
+
+frankenphp_log("some info message", 0, [
+    "key string" => "string",
+]);
+
+frankenphp_log("some warn message", 4);
+
+frankenphp_log("some error message", 8, [
+    "err" => ["a", "v"],
+]);