summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--plugins/logger/config.go2
-rw-r--r--plugins/server/plugin.go18
-rw-r--r--tests/plugins/http/http_plugin_test.go17
-rw-r--r--tests/plugins/logger/configs/.rr-raw-mode.yaml12
-rw-r--r--tests/plugins/logger/logger_test.go129
-rw-r--r--tests/raw-error.php11
7 files changed, 100 insertions, 96 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32ce421..f014a692 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,13 @@
CHANGELOG
=========
-v2.1.0 (06.04.2021)
+v2.0.4 (06.04.2021)
-------------------
+## 🔥 New:
+
+- 📜 Add a new `raw` mode for the `logger` plugin to keep the stderr log message of the worker unmodified (logger severity level should be at least `INFO`).
+
## 🩹 Fixes:
- 🐛 Fix: bug with the temporal worker which does not follow general graceful shutdown period.
@@ -14,7 +18,6 @@ v2.0.3 (29.03.2021)
## 🩹 Fixes:
- 🐛 Fix: slow last response when reached `max_jobs` limit.
-- 📜 Add a new `raw` mode for the `logger` plugin to keep the stderr log message of the worker unmodified.
v2.0.2 (06.04.2021)
-------------------
diff --git a/plugins/logger/config.go b/plugins/logger/config.go
index bfe45f78..eee5fb71 100644
--- a/plugins/logger/config.go
+++ b/plugins/logger/config.go
@@ -52,7 +52,7 @@ func (cfg *Config) BuildLogger() (*zap.Logger, error) {
zCfg = zap.NewDevelopmentConfig()
case "raw":
zCfg = zap.Config{
- Level: zap.NewAtomicLevelAt(zap.DebugLevel),
+ Level: zap.NewAtomicLevelAt(zap.InfoLevel),
Encoding: "console",
EncoderConfig: zapcore.EncoderConfig{
MessageKey: "message",
diff --git a/plugins/server/plugin.go b/plugins/server/plugin.go
index f708b15e..c3496ae7 100644
--- a/plugins/server/plugin.go
+++ b/plugins/server/plugin.go
@@ -6,6 +6,7 @@ import (
"os"
"os/exec"
"strings"
+ "unsafe"
"github.com/spiral/errors"
"github.com/spiral/roadrunner/v2/pkg/transport"
@@ -234,10 +235,10 @@ func (server *Plugin) collectEvents(event interface{}) {
case events.EventWorkerError:
server.log.Error(strings.TrimRight(we.Payload.(error).Error(), " \n\t"))
case events.EventWorkerLog:
- server.log.Debug(strings.TrimRight(string(we.Payload.([]byte)), " \n\t"))
+ server.log.Debug(strings.TrimRight(toString(we.Payload.([]byte)), " \n\t"))
+ // stderr event is INFO level
case events.EventWorkerStderr:
- // TODO unsafe byte to string convert
- server.log.Debug(strings.TrimRight(string(we.Payload.([]byte)), " \n\t"))
+ server.log.Info(strings.TrimRight(toString(we.Payload.([]byte)), " \n\t"))
}
}
}
@@ -248,10 +249,15 @@ func (server *Plugin) collectWorkerLogs(event interface{}) {
case events.EventWorkerError:
server.log.Error(strings.TrimRight(we.Payload.(error).Error(), " \n\t"))
case events.EventWorkerLog:
- server.log.Debug(strings.TrimRight(string(we.Payload.([]byte)), " \n\t"))
+ server.log.Debug(strings.TrimRight(toString(we.Payload.([]byte)), " \n\t"))
+ // stderr event is INFO level
case events.EventWorkerStderr:
- // TODO unsafe byte to string convert
- server.log.Debug(strings.TrimRight(string(we.Payload.([]byte)), " \n\t"))
+ server.log.Info(strings.TrimRight(toString(we.Payload.([]byte)), " \n\t"))
}
}
}
+
+// unsafe, but lightning fast []byte to string conversion
+func toString(data []byte) string {
+ return *(*string)(unsafe.Pointer(&data))
+}
diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go
index cf22a9cd..51c5fda2 100644
--- a/tests/plugins/http/http_plugin_test.go
+++ b/tests/plugins/http/http_plugin_test.go
@@ -1003,21 +1003,22 @@ server:
env:
"RR_HTTP": "true"
relay: "pipes"
- relayTimeout: "20s"
+ relay_timeout: "20s"
http:
debug: true
address: 127.0.0.1:34999
- maxRequestSize: 1024
+ max_request_size: 1024
middleware: [ "pluginMiddleware", "pluginMiddleware2" ]
uploads:
forbid: [ "" ]
- trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+ trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
pool:
- numWorkers: 2
- maxJobs: 0
- allocateTimeout: 60s
- destroyTimeout: 60s
+ num_workers: 2
+ max_jobs: 0
+ allocate_timeout: 60s
+ destroy_timeout: 60s
+
logs:
mode: development
level: error
@@ -1037,7 +1038,7 @@ logs:
mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Debug("201 GET http://localhost:34999/?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
- mockLogger.EXPECT().Debug("WORLD", "pid", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Info("WORLD").MinTimes(1)
mockLogger.EXPECT().Debug("worker event received", "event", events.EventWorkerLog, "worker state", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror
diff --git a/tests/plugins/logger/configs/.rr-raw-mode.yaml b/tests/plugins/logger/configs/.rr-raw-mode.yaml
index 0e62ab95..fba25945 100644
--- a/tests/plugins/logger/configs/.rr-raw-mode.yaml
+++ b/tests/plugins/logger/configs/.rr-raw-mode.yaml
@@ -4,12 +4,12 @@ server:
http:
address: 127.0.0.1:34999
- maxRequestSize: 1024
+ max_requestSize: 1024
pool:
- numWorkers: 1
- maxJobs: 0
- allocateTimeout: 10s
- destroyTimeout: 10s
+ num_workers: 1
+ max_jobs: 0
+ allocate_timeout: 10s
+ destroy_timeout: 10s
logs:
- mode: raw \ No newline at end of file
+ mode: raw
diff --git a/tests/plugins/logger/logger_test.go b/tests/plugins/logger/logger_test.go
index f212cc8a..d2877781 100644
--- a/tests/plugins/logger/logger_test.go
+++ b/tests/plugins/logger/logger_test.go
@@ -7,14 +7,14 @@ import (
"syscall"
"testing"
- "github.com/kami-zh/go-capturer"
-
+ "github.com/golang/mock/gomock"
endure "github.com/spiral/endure/pkg/container"
"github.com/spiral/roadrunner/v2/plugins/config"
"github.com/spiral/roadrunner/v2/plugins/http"
"github.com/spiral/roadrunner/v2/plugins/logger"
"github.com/spiral/roadrunner/v2/plugins/rpc"
"github.com/spiral/roadrunner/v2/plugins/server"
+ "github.com/spiral/roadrunner/v2/tests/mocks"
"github.com/stretchr/testify/assert"
)
@@ -78,71 +78,74 @@ func TestLogger(t *testing.T) {
}
func TestLoggerRawErr(t *testing.T) {
- out := capturer.CaptureOutput(func() {
- cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
- assert.NoError(t, err)
-
- // config plugin
- cfg := &config.Viper{}
- cfg.Path = "configs/.rr-raw-mode.yaml"
- cfg.Prefix = "rr"
-
- err = cont.RegisterAll(
- cfg,
- &logger.ZapLogger{},
- &server.Plugin{},
- &http.Plugin{},
- )
- assert.NoError(t, err)
-
- err = cont.Init()
- if err != nil {
- t.Fatal(err)
- }
+ cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
+ assert.NoError(t, err)
+
+ // config plugin
+ cfg := &config.Viper{}
+ cfg.Path = "configs/.rr-raw-mode.yaml"
+ cfg.Prefix = "rr"
+
+ controller := gomock.NewController(t)
+ mockLogger := mocks.NewMockLogger(controller)
+
+ mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Info("{\"field\": \"value\"}").MinTimes(1)
+ mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).MinTimes(1)
+
+ err = cont.RegisterAll(
+ cfg,
+ mockLogger,
+ &server.Plugin{},
+ &http.Plugin{},
+ )
+ assert.NoError(t, err)
+
+ err = cont.Init()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ ch, err := cont.Serve()
+ assert.NoError(t, err)
+
+ sig := make(chan os.Signal, 1)
+ signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
- ch, err := cont.Serve()
- assert.NoError(t, err)
-
- sig := make(chan os.Signal, 1)
- signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
-
- wg := &sync.WaitGroup{}
- wg.Add(1)
-
- stopCh := make(chan struct{}, 1)
-
- go func() {
- defer wg.Done()
- for {
- select {
- case e := <-ch:
- assert.Fail(t, "error", e.Error.Error())
- err = cont.Stop()
- if err != nil {
- assert.FailNow(t, "error", err.Error())
- }
- case <-sig:
- err = cont.Stop()
- if err != nil {
- assert.FailNow(t, "error", err.Error())
- }
- return
- case <-stopCh:
- // timeout
- err = cont.Stop()
- if err != nil {
- assert.FailNow(t, "error", err.Error())
- }
- return
+ wg := &sync.WaitGroup{}
+ wg.Add(1)
+
+ stopCh := make(chan struct{}, 1)
+
+ go func() {
+ defer wg.Done()
+ for {
+ select {
+ case e := <-ch:
+ assert.Fail(t, "error", e.Error.Error())
+ err = cont.Stop()
+ if err != nil {
+ assert.FailNow(t, "error", err.Error())
+ }
+ case <-sig:
+ err = cont.Stop()
+ if err != nil {
+ assert.FailNow(t, "error", err.Error())
}
+ return
+ case <-stopCh:
+ // timeout
+ err = cont.Stop()
+ if err != nil {
+ assert.FailNow(t, "error", err.Error())
+ }
+ return
}
- }()
-
- stopCh <- struct{}{}
- wg.Wait()
- })
+ }
+ }()
- assert.Contains(t, out, "\n{\"field\": \"value\"}\n")
+ stopCh <- struct{}{}
+ wg.Wait()
}
func TestLoggerNoConfig(t *testing.T) {
diff --git a/tests/raw-error.php b/tests/raw-error.php
index e8ca328b..3caf46c5 100644
--- a/tests/raw-error.php
+++ b/tests/raw-error.php
@@ -18,13 +18,4 @@ $psr7 = new RoadRunner\Http\PSR7Worker(
error_log('{"field": "value"}');
-while ($req = $psr7->waitRequest()) {
- try {
- $resp = new \Nyholm\Psr7\Response();
- $resp->getBody()->write("hello world");
-
- $psr7->respond($resp);
- } catch (\Throwable $e) {
- $psr7->getWorker()->error((string)$e);
- }
-} \ No newline at end of file
+while ($req = $psr7->waitRequest()) {}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 18:15:42 +0000