Merge pull request #378 from spiral/feature/loggingv2.0.0-alpha14

Feature/logging

5 files changed, 231 insertions, 0 deletions

diff --git a/plugins/app/tests/.rr.yaml b/plugins/app/tests/.rr.yaml
new file mode 100644
index 00000000..171f51dc
--- /dev/null
+++ b/plugins/app/tests/.rr.yaml
@@ -0,0 +1,9 @@
+app:
+  command: "php hello.php"
+  user: ""
+  group: ""
+  env:
+    "RR_CONFIG": "/some/place/on/the/C134"
+    "RR_CONFIG2": "C138"
+  relay: "pipes"
+  relayTimeout: "20s"
\ No newline at end of file
diff --git a/plugins/app/tests/factory_test.go b/plugins/app/tests/factory_test.go
new file mode 100644
index 00000000..7c885797
--- /dev/null
+++ b/plugins/app/tests/factory_test.go
@@ -0,0 +1,78 @@
+package tests
+
+import (
+	"os"
+	"os/signal"
+	"testing"
+	"time"
+
+	"github.com/spiral/endure"
+	"github.com/spiral/roadrunner/v2/plugins/app"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFactory(t *testing.T) {
+	container, err := endure.NewContainer(endure.DebugLevel, endure.RetryOnFail(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+	// config plugin
+	vp := &config.ViperProvider{}
+	vp.Path = ".rr.yaml"
+	vp.Prefix = "rr"
+	err = container.Register(vp)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = container.Register(&app.App{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = container.Register(&Foo{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = container.Register(&Foo2{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = container.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	errCh, err := container.Serve()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// stop by CTRL+C
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+
+	tt := time.NewTicker(time.Second * 2)
+
+	for {
+		select {
+		case e := <-errCh:
+			assert.NoError(t, e.Error)
+			assert.NoError(t, container.Stop())
+			return
+		case <-c:
+			er := container.Stop()
+			if er != nil {
+				panic(er)
+			}
+			return
+		case <-tt.C:
+			tt.Stop()
+			assert.NoError(t, container.Stop())
+			return
+		}
+	}
+}
diff --git a/plugins/app/tests/hello.php b/plugins/app/tests/hello.php
new file mode 100644
index 00000000..bf9e82cc
--- /dev/null
+++ b/plugins/app/tests/hello.php
@@ -0,0 +1 @@
+<?php echo "hello1 - " . time();
\ No newline at end of file
diff --git a/plugins/app/tests/plugin_1.go b/plugins/app/tests/plugin_1.go
new file mode 100644
index 00000000..7259ea9d
--- /dev/null
+++ b/plugins/app/tests/plugin_1.go
@@ -0,0 +1,55 @@
+package tests
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/spiral/roadrunner/v2/plugins/app"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+)
+
+type Foo struct {
+	configProvider config.Provider
+	spawner        app.WorkerFactory
+}
+
+func (f *Foo) Init(p config.Provider, spw app.WorkerFactory) error {
+	f.configProvider = p
+	f.spawner = spw
+	return nil
+}
+
+func (f *Foo) Serve() chan error {
+	errCh := make(chan error, 1)
+
+	r := &app.Config{}
+	err := f.configProvider.UnmarshalKey("app", r)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	cmd, err := f.spawner.CmdFactory(nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+	if cmd == nil {
+		errCh <- errors.New("command is nil")
+		return errCh
+	}
+	a := cmd()
+	out, err := a.Output()
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	fmt.Println(string(out))
+
+	return errCh
+}
+
+func (f *Foo) Stop() error {
+	return nil
+}
diff --git a/plugins/app/tests/plugin_2.go b/plugins/app/tests/plugin_2.go
new file mode 100644
index 00000000..fbb9ca11
--- /dev/null
+++ b/plugins/app/tests/plugin_2.go
@@ -0,0 +1,88 @@
+package tests
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/spiral/roadrunner/v2"
+	"github.com/spiral/roadrunner/v2/plugins/app"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+)
+
+type Foo2 struct {
+	configProvider config.Provider
+	wf             app.WorkerFactory
+}
+
+func (f *Foo2) Init(p config.Provider, workerFactory app.WorkerFactory) error {
+	f.configProvider = p
+	f.wf = workerFactory
+	return nil
+}
+
+func (f *Foo2) Serve() chan error {
+	errCh := make(chan error, 1)
+
+	r := &app.Config{}
+	err := f.configProvider.UnmarshalKey("app", r)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	cmd, err := f.wf.CmdFactory(nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+	if cmd == nil {
+		errCh <- errors.New("command is nil")
+		return errCh
+	}
+	a := cmd()
+	out, err := a.Output()
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	w, err := f.wf.NewWorker(context.Background(), nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	_ = w
+
+	poolConfig := roadrunner.Config{
+		NumWorkers:      10,
+		MaxJobs:         100,
+		AllocateTimeout: time.Second * 10,
+		DestroyTimeout:  time.Second * 10,
+		Supervisor: &roadrunner.SupervisorConfig{
+			WatchTick:       60,
+			TTL:             1000,
+			IdleTTL:         10,
+			ExecTTL:         10,
+			MaxWorkerMemory: 1000,
+		},
+	}
+
+	pool, err := f.wf.NewWorkerPool(context.Background(), poolConfig, nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	_ = pool
+
+	fmt.Println(string(out))
+
+	return errCh
+}
+
+func (f *Foo2) Stop() error {
+	return nil
+}