birbnetes/output-service-rdb
birbnetes
/
output-service-rdb
4
0
Fork 0
Code Pull Requests Releases Wiki Activity

change config strings
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Torma Kristóf 2020-04-06 01:17:15 +02:00
parent 5758721ab9
commit a43b692acf
Signed by: tormakris
GPG Key ID: DC83C4F2C41B1047
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

@ -25,8 +25,11 @@ services:
POSTGRES_DB: "output-service-rdb"
DB_URL: "jdbc:postgresql://output-service-postgres:5432/output-service-rdb"
MQ_HOST: rabbitmq
MQ_USERNAME: rabbitmq
MQ_USERNMAE: rabbitmq
MQ_PASSWORD: rabbitmq
depends_on:
- rabbitmq
- output-service-postgres
rabbitmq:
image: "rabbitmq:3-management"

8
resources/application.conf
View File

@ -7,13 +7,13 @@ ktor {
modules = [ com.kmalbz.ApplicationKt.module ]
}
db {
jdbcUrl = ${DB_URL} //jdbc:postgresql://localhost:${db_port}/${db_name}
dbUser = ${DB_USER}
dbPassword = ${DB_PASSWORD}
jdbc = ${DB_URL}
user = ${DB_USER}
password = ${DB_PASSWORD}
}
mq{
host = ${MQ_HOST}
username = ${MQ_USERNMAE}
username = ${MQ_USERNAME}
password = ${MQ_PASSWORD}
}
}

6
src/database/DatabaseFactory.kt
View File

@ -14,11 +14,11 @@ object DatabaseFactory {
@KtorExperimentalAPI
private val appConfig = HoconApplicationConfig(ConfigFactory.load())
@KtorExperimentalAPI
private val dbUrl = appConfig.property("db.jdbcUrl").getString()
private val dbUrl = appConfig.property("db.jdbc").getString()
@KtorExperimentalAPI
private val dbUser = appConfig.property("db.dbUser").getString()
private val dbUser = appConfig.property("db.user").getString()
@KtorExperimentalAPI
private val dbPassword = appConfig.property("db.dbPassword").getString()
private val dbPassword = appConfig.property("db.password").getString()
@KtorExperimentalAPI
fun init() {