summaryrefslogtreecommitdiff
path: root/tests/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'tests/plugins')
-rw-r--r--tests/plugins/logger/configs/.rr-raw-mode.yaml15
-rw-r--r--tests/plugins/logger/logger_test.go71
-rw-r--r--tests/plugins/logger/plugin.go7
3 files changed, 93 insertions, 0 deletions
diff --git a/tests/plugins/logger/configs/.rr-raw-mode.yaml b/tests/plugins/logger/configs/.rr-raw-mode.yaml
new file mode 100644
index 00000000..0e62ab95
--- /dev/null
+++ b/tests/plugins/logger/configs/.rr-raw-mode.yaml
@@ -0,0 +1,15 @@
+server:
+ command: "php ../../raw-error.php"
+ relay: "pipes"
+
+http:
+ address: 127.0.0.1:34999
+ maxRequestSize: 1024
+ pool:
+ numWorkers: 1
+ maxJobs: 0
+ allocateTimeout: 10s
+ destroyTimeout: 10s
+
+logs:
+ mode: raw \ No newline at end of file
diff --git a/tests/plugins/logger/logger_test.go b/tests/plugins/logger/logger_test.go
index 7f378026..f212cc8a 100644
--- a/tests/plugins/logger/logger_test.go
+++ b/tests/plugins/logger/logger_test.go
@@ -4,8 +4,11 @@ import (
"os"
"os/signal"
"sync"
+ "syscall"
"testing"
+ "github.com/kami-zh/go-capturer"
+
endure "github.com/spiral/endure/pkg/container"
"github.com/spiral/roadrunner/v2/plugins/config"
"github.com/spiral/roadrunner/v2/plugins/http"
@@ -74,6 +77,74 @@ func TestLogger(t *testing.T) {
wg.Wait()
}
+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)
+ }
+
+ 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
+ }
+ }
+ }()
+
+ stopCh <- struct{}{}
+ wg.Wait()
+ })
+
+ assert.Contains(t, out, "\n{\"field\": \"value\"}\n")
+}
+
func TestLoggerNoConfig(t *testing.T) {
container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel))
if err != nil {
diff --git a/tests/plugins/logger/plugin.go b/tests/plugins/logger/plugin.go
index 9ddf9ec9..aa62f2b3 100644
--- a/tests/plugins/logger/plugin.go
+++ b/tests/plugins/logger/plugin.go
@@ -1,6 +1,8 @@
package logger
import (
+ "strings"
+
"github.com/spiral/errors"
"github.com/spiral/roadrunner/v2/plugins/config"
"github.com/spiral/roadrunner/v2/plugins/logger"
@@ -28,6 +30,11 @@ func (p1 *Plugin) Serve() chan error {
p1.log.Info("error", "test")
p1.log.Debug("error", "test")
p1.log.Warn("error", "test")
+
+ // test the `raw` mode
+ messageJSON := []byte(`{"field": "value"}`)
+ p1.log.Debug(strings.TrimRight(string(messageJSON), " \n\t"))
+
return errCh
}