ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http service: use jedis connection pool

Browse Source
This commit is contained in:
Adam
2019-01-05 09:39:37 -05:00
parent 50f2f78baf
commit ce18860d10
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
View File

@@ -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

12
http-service/src/main/java/net/runelite/http/service/account/AccountService.java
View File

@@ -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")