From ce18860d10979f10d2e61633aaa441561381a558 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sat, 5 Jan 2019 09:39:37 -0500
Subject: [PATCH] http service: use jedis connection pool

---
 .../http/service/SpringBootWebApplication.java       |  7 ++++---
 .../http/service/account/AccountService.java         | 12 ++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
index 73aae1c360..4ca28423a7 100644
--- a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
+++ b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
@@ -49,7 +49,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.sql2o.Sql2o;
 import org.sql2o.converters.Converter;
 import org.sql2o.quirks.NoQuirks;
-import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
 
 @SpringBootApplication
 @EnableScheduling
@@ -130,9 +131,9 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
 	}
 
 	@Bean
-	Jedis jedis()
+	JedisPool jedis()
 	{
-		return new Jedis(redisHost);
+		return new JedisPool(new JedisPoolConfig(), redisHost);
 	}
 
 	@Override
diff --git a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
index 99ca9e2c54..0d636edfc7 100644
--- a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
+++ b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java
@@ -58,6 +58,7 @@ import org.sql2o.Connection;
 import org.sql2o.Sql2o;
 import org.sql2o.Sql2oException;
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
 
 @RestController
 @RequestMapping("/account")
@@ -97,7 +98,7 @@ public class AccountService
 	private final String oauthClientId;
 	private final String oauthClientSecret;
 	private final AuthFilter auth;
-	private final Jedis jedis;
+	private final JedisPool jedisPool;
 
 	@Autowired
 	public AccountService(
@@ -105,14 +106,14 @@ public class AccountService
 		@Value("${oauth.client-id}") String oauthClientId,
 		@Value("${oauth.client-secret}") String oauthClientSecret,
 		AuthFilter auth,
-		Jedis jedis
+		JedisPool jedisPool
 	)
 	{
 		this.sql2o = sql2o;
 		this.oauthClientId = oauthClientId;
 		this.oauthClientSecret = oauthClientSecret;
 		this.auth = auth;
-		this.jedis = jedis;
+		this.jedisPool = jedisPool;
 
 		try (Connection con = sql2o.open())
 		{
@@ -248,7 +249,10 @@ public class AccountService
 			service.send(response);
 		}
 
-		jedis.publish("session." + uuid, websocketGson.toJson(response, WebsocketMessage.class));
+		try (Jedis jedis = jedisPool.getResource())
+		{
+			jedis.publish("session." + uuid, websocketGson.toJson(response, WebsocketMessage.class));
+		}
 	}
 
 	@RequestMapping("/logout")