diff options
author | Valery Piashchynski <[email protected]> | 2020-12-17 10:11:56 +0300 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-17 10:11:56 +0300 |
commit | a1dc59cabb6e63eab232922f4eb5a19dbd168f44 (patch) | |
tree | a35057cd5b8d22002bbd05812a3fb604ce03b705 /plugins/server | |
parent | de3c2274d0009b63ead05ddf3d699012f1d11ada (diff) | |
parent | 1033c25b6bfc752d6059e446510f651e22cbf49b (diff) |
Merge pull request #448 from spiral/plugin/reloader
[RR2] Plugin/reload
Diffstat (limited to 'plugins/server')
-rw-r--r-- | plugins/server/tests/configs/.rr-no-app-section.yaml | 5 | ||||
-rw-r--r-- | plugins/server/tests/configs/.rr-sockets.yaml | 5 | ||||
-rw-r--r-- | plugins/server/tests/configs/.rr-tcp.yaml | 5 | ||||
-rw-r--r-- | plugins/server/tests/configs/.rr-wrong-command.yaml | 3 | ||||
-rw-r--r-- | plugins/server/tests/configs/.rr-wrong-relay.yaml | 5 | ||||
-rw-r--r-- | plugins/server/tests/configs/.rr.yaml | 5 | ||||
-rw-r--r-- | plugins/server/tests/server_test.go | 14 |
7 files changed, 30 insertions, 12 deletions
diff --git a/plugins/server/tests/configs/.rr-no-app-section.yaml b/plugins/server/tests/configs/.rr-no-app-section.yaml index b6e3ea93..5266e83d 100644 --- a/plugins/server/tests/configs/.rr-no-app-section.yaml +++ b/plugins/server/tests/configs/.rr-no-app-section.yaml @@ -6,4 +6,7 @@ server: "RR_CONFIG": "/some/place/on/the/C134" "RR_CONFIG2": "C138" relay: "pipes" - relayTimeout: "20s"
\ No newline at end of file + relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/configs/.rr-sockets.yaml b/plugins/server/tests/configs/.rr-sockets.yaml index ab1239aa..6b5b6bf5 100644 --- a/plugins/server/tests/configs/.rr-sockets.yaml +++ b/plugins/server/tests/configs/.rr-sockets.yaml @@ -6,4 +6,7 @@ server: "RR_CONFIG": "/some/place/on/the/C134" "RR_CONFIG2": "C138" relay: "unix://unix.sock" - relayTimeout: "20s"
\ No newline at end of file + relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/configs/.rr-tcp.yaml b/plugins/server/tests/configs/.rr-tcp.yaml index f53bffcc..ee1d450a 100644 --- a/plugins/server/tests/configs/.rr-tcp.yaml +++ b/plugins/server/tests/configs/.rr-tcp.yaml @@ -6,4 +6,7 @@ server: "RR_CONFIG": "/some/place/on/the/C134" "RR_CONFIG2": "C138" relay: "tcp://localhost:9999" - relayTimeout: "20s"
\ No newline at end of file + relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/configs/.rr-wrong-command.yaml b/plugins/server/tests/configs/.rr-wrong-command.yaml index d2c087a6..e66349dd 100644 --- a/plugins/server/tests/configs/.rr-wrong-command.yaml +++ b/plugins/server/tests/configs/.rr-wrong-command.yaml @@ -7,3 +7,6 @@ server: "RR_CONFIG2": "C138" relay: "pipes" relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/configs/.rr-wrong-relay.yaml b/plugins/server/tests/configs/.rr-wrong-relay.yaml index 1dd73d73..98894c7a 100644 --- a/plugins/server/tests/configs/.rr-wrong-relay.yaml +++ b/plugins/server/tests/configs/.rr-wrong-relay.yaml @@ -6,4 +6,7 @@ server: "RR_CONFIG": "/some/place/on/the/C134" "RR_CONFIG2": "C138" relay: "pupes" - relayTimeout: "20s"
\ No newline at end of file + relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/configs/.rr.yaml b/plugins/server/tests/configs/.rr.yaml index b6e3ea93..5266e83d 100644 --- a/plugins/server/tests/configs/.rr.yaml +++ b/plugins/server/tests/configs/.rr.yaml @@ -6,4 +6,7 @@ server: "RR_CONFIG": "/some/place/on/the/C134" "RR_CONFIG2": "C138" relay: "pipes" - relayTimeout: "20s"
\ No newline at end of file + relayTimeout: "20s" +logs: + mode: development + level: error
\ No newline at end of file diff --git a/plugins/server/tests/server_test.go b/plugins/server/tests/server_test.go index bc374a9e..faf01b11 100644 --- a/plugins/server/tests/server_test.go +++ b/plugins/server/tests/server_test.go @@ -14,7 +14,7 @@ import ( ) func TestAppPipes(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -80,7 +80,7 @@ func TestAppPipes(t *testing.T) { } func TestAppSockets(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -146,7 +146,7 @@ func TestAppSockets(t *testing.T) { } func TestAppTCP(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -212,7 +212,7 @@ func TestAppTCP(t *testing.T) { } func TestAppWrongConfig(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -244,7 +244,7 @@ func TestAppWrongConfig(t *testing.T) { } func TestAppWrongRelay(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -280,7 +280,7 @@ func TestAppWrongRelay(t *testing.T) { } func TestAppWrongCommand(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } @@ -318,7 +318,7 @@ func TestAppWrongCommand(t *testing.T) { } func TestAppNoAppSectionInConfig(t *testing.T) { - container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.DebugLevel)) + container, err := endure.NewContainer(nil, endure.RetryOnFail(true), endure.SetLogLevel(endure.ErrorLevel)) if err != nil { t.Fatal(err) } |