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

Normalize configuration between cache-updater and http-service

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2019-02-16 14:23:58 +01:00
committed by Adam
parent 4500b74c89
commit 94a0ee5587
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cache-updater/application.properties
View File

@@ -1,7 +0,0 @@
jdbc.url=jdbc:mysql://192.168.1.2:3306/cache
jdbc.username=runelite
jdbc.password=runelite
minio.url=http://192.168.1.2:9000
minio.accesskey=QPQ15JX1ESAVMR0TLCL1
minio.secretkey=
minio.bucket=runelite

21
cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java vendored
View File

@@ -33,9 +33,10 @@ import java.util.Map;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.sql2o.Sql2o; import org.sql2o.Sql2o;
import org.sql2o.converters.Converter; import org.sql2o.converters.Converter;
import org.sql2o.quirks.NoQuirks; import org.sql2o.quirks.NoQuirks;
@@ -43,16 +44,7 @@ import org.sql2o.quirks.NoQuirks;
@Configuration @Configuration
public class CacheConfiguration public class CacheConfiguration
{ {
@Value("${jdbc.url}") @Value("${minio.endpoint}")
private String jdbcUrl;
@Value("${jdbc.username}")
private String jdbcUsername;
@Value("${jdbc.password}")
private String jdbcPassword;
@Value("${minio.url}")
private String minioUrl; private String minioUrl;
@Value("${minio.accesskey}") @Value("${minio.accesskey}")
@@ -62,13 +54,10 @@ public class CacheConfiguration
private String minioSecretKey; private String minioSecretKey;
@Bean @Bean
@ConfigurationProperties(prefix = "datasource.runelite-cache")
public DataSource dataSource() public DataSource dataSource()
{ {
DriverManagerDataSource dataSource = new DriverManagerDataSource(); return DataSourceBuilder.create().build();
dataSource.setUrl(jdbcUrl);
dataSource.setUsername(jdbcUsername);
dataSource.setPassword(jdbcPassword);
return dataSource;
} }
@Bean @Bean

16
cache-updater/src/main/resources/application.yaml Normal file
View File

@@ -0,0 +1,16 @@
---
# Database
datasource:
runelite-cache:
driverClassName: com.mysql.jdbc.Driver
type: com.mysql.jdbc.jdbc2.optional.MysqlDataSource
url: jdbc:mysql://localhost/runelite-cache
username: runelite
password: runelite
# Minio client storage for cache
minio:
endpoint: http://localhost:9000
accesskey: AM54M27O4WZK65N6F8IP
secretkey: /PZCxzmsJzwCHYlogcymuprniGCaaLUOET2n6yMP
bucket: runelite