diff --git a/Makefile b/Makefile index d4699a2ce..9d56aadf0 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ PATH := ./work/redis-git/src:${PATH} define REDIS1_CONF daemonize yes port 6479 +bind 0.0.0.0 +protected-mode no pidfile work/redis1-6479.pid logfile work/redis1-6479.log save "" @@ -13,6 +15,8 @@ endef # SENTINELS define REDIS_SENTINEL1 port 26379 +bind 0.0.0.0 +protected-mode no daemonize yes sentinel monitor mymaster 127.0.0.1 6479 1 sentinel down-after-milliseconds mymaster 2000 diff --git a/src/test/java/biz/paluch/logging/gelf/jul/GelfLogHandlerRedisIntegrationTests.java b/src/test/java/biz/paluch/logging/gelf/jul/GelfLogHandlerRedisIntegrationTests.java index 5c4400654..dceb9b2cd 100644 --- a/src/test/java/biz/paluch/logging/gelf/jul/GelfLogHandlerRedisIntegrationTests.java +++ b/src/test/java/biz/paluch/logging/gelf/jul/GelfLogHandlerRedisIntegrationTests.java @@ -33,7 +33,7 @@ class GelfLogHandlerRedisIntegrationTests { private Jedis jedis; @BeforeEach - void before() throws Exception { + void before() { // enable the test with -Dtest.withRedis=true assumeTrue(Sockets.isOpen("localhost", 6479)); @@ -63,7 +63,6 @@ void testStandalone() throws Exception { assertThat(map.get("full_message")).isEqualTo(expectedMessage); assertThat(map.get("short_message")).isEqualTo(expectedMessage); assertThat(map.get("fieldName1")).isEqualTo("fieldValue1"); - } @Test @@ -87,7 +86,6 @@ void testSentinel() throws Exception { assertThat(map.get("full_message")).isEqualTo(expectedMessage); assertThat(map.get("short_message")).isEqualTo(expectedMessage); assertThat(map.get("fieldName1")).isEqualTo("fieldValue1"); - } @Test @@ -120,7 +118,7 @@ void testRedisWithPortUri() throws Exception { } @Test - void uriWithoutHost() throws Exception { + void uriWithoutHost() { String uri = "redis:///#list"; @@ -134,11 +132,10 @@ public void execute() throws Throwable { new RedisGelfSenderProvider().create(configuration); } }); - } @Test - void uriWithoutFragment() throws Exception { + void uriWithoutFragment() { String uri = "redis://host/"; @@ -155,7 +152,7 @@ public void execute() throws Throwable { } @Test - void uriWithoutFragment2() throws Exception { + void uriWithoutFragment2() { String uri = "redis://host"; @@ -172,7 +169,7 @@ public void execute() throws Throwable { } @Test - void uriWithoutFragment3() throws Exception { + void uriWithoutFragment3() { String uri = "redis://host#";