Read database connection parameters from environment
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
from datetime import datetime
|
||||
|
||||
@@ -111,7 +112,13 @@ class PluralKitBot:
|
||||
async def run(self):
|
||||
try:
|
||||
self.logger.info("Connecting to database...")
|
||||
self.pool = await db.connect()
|
||||
self.pool = await db.connect(
|
||||
os.environ["DATABASE_USER"],
|
||||
os.environ["DATABASE_PASS"],
|
||||
os.environ["DATABASE_NAME"],
|
||||
os.environ["DATABASE_HOST"],
|
||||
int(os.environ["DATABASE_PORT"])
|
||||
)
|
||||
|
||||
self.logger.info("Attempting to create tables...")
|
||||
async with self.pool.acquire() as conn:
|
||||
|
@@ -11,10 +11,10 @@ from discord.utils import snowflake_time
|
||||
from pluralkit import System, Member, stats
|
||||
|
||||
logger = logging.getLogger("pluralkit.db")
|
||||
async def connect():
|
||||
async def connect(username, password, database, host, port):
|
||||
while True:
|
||||
try:
|
||||
return await asyncpg.create_pool(user="postgres", password="postgres", database="postgres", host="db")
|
||||
return await asyncpg.create_pool(user=username, password=password, database=database, host=host, port=port)
|
||||
except (ConnectionError, asyncpg.exceptions.CannotConnectNowError):
|
||||
pass
|
||||
|
||||
|
Reference in New Issue
Block a user