From 99e2fad2b206acebdfe875b8917600fc21e86197 Mon Sep 17 00:00:00 2001
From: Ske <voltasalt@gmail.com>
Date: Sat, 1 Sep 2018 19:16:42 +0200
Subject: [PATCH] Make InfluxDB connection options configurable

---
 docker-compose.yml            |  3 +++
 src/pluralkit/bot/__init__.py | 21 +++++++++++++--------
 src/pluralkit/stats.py        |  6 +++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8c8b6b4b..e827cb4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,9 @@ services:
     - "DATABASE_NAME=postgres"
     - "DATABASE_HOST=db"
     - "DATABASE_PORT=5432"
+    - "INFLUX_HOST=influx"
+    - "INFLUX_PORT=8086"
+    - "INFLUX_DB=pluralkit"
     restart: always
   api:
     build: src/
diff --git a/src/pluralkit/bot/__init__.py b/src/pluralkit/bot/__init__.py
index ac02c896..e797f178 100644
--- a/src/pluralkit/bot/__init__.py
+++ b/src/pluralkit/bot/__init__.py
@@ -43,13 +43,13 @@ class PluralKitBot:
         # Ignore bot messages
         if message.author.bot:
             return
-        
+
         if await self.handle_command_dispatch(message):
             return
 
         if await self.handle_proxy_dispatch(message):
             return
-            
+
     async def on_socket_raw_receive(self, msg):
         # Since on_reaction_add is buggy (only works for messages the bot's already cached, ie. no old messages)
         # we parse socket data manually for the reaction add event
@@ -77,7 +77,7 @@ class PluralKitBot:
     async def handle_command_dispatch(self, message):
         command_items = commands.command_list.items()
         command_items = sorted(command_items, key=lambda x: len(x[0]), reverse=True)
-        
+
         prefix = "pk;"
         for command_name, command in command_items:
             if message.content.lower().startswith(prefix + command_name):
@@ -99,7 +99,7 @@ class PluralKitBot:
                     await self.stats.report_command(command_name, execution_time, response_time)
 
                     return True
-    
+
     async def handle_proxy_dispatch(self, message):
         # Try doing proxy parsing
         async with self.pool.acquire() as conn:
@@ -126,11 +126,16 @@ class PluralKitBot:
             async with self.pool.acquire() as conn:
                 await db.create_tables(conn)
 
-            self.logger.info("Connecting to InfluxDB...")
-            self.stats = await InfluxStatCollector.connect()
+            if "INFLUX_HOST" in os.environ:
+                self.logger.info("Connecting to InfluxDB...")
+                self.stats = await InfluxStatCollector.connect(
+                    os.environ["INFLUX_HOST"],
+                    os.environ["INFLUX_PORT"],
+                    os.environ["INFLUX_DB"]
+                )
 
-            self.logger.info("Starting periodical stat reporting...")
-            asyncio.get_event_loop().create_task(self.periodical_stat_timer(self.pool))
+                self.logger.info("Starting periodical stat reporting...")
+                asyncio.get_event_loop().create_task(self.periodical_stat_timer(self.pool))
 
             self.logger.info("Connecting to Discord...")
             await self.client.start(self.token)
diff --git a/src/pluralkit/stats.py b/src/pluralkit/stats.py
index dae06021..d4e0e86d 100644
--- a/src/pluralkit/stats.py
+++ b/src/pluralkit/stats.py
@@ -21,9 +21,9 @@ class NullStatCollector(StatCollector):
 
 class InfluxStatCollector(StatCollector):
     @staticmethod
-    async def connect():
-        client = InfluxDBClient(host="influx", db="pluralkit")
-        await client.create_database(db="pluralkit")
+    async def connect(host: str, port: int, db: str):
+        client = InfluxDBClient(host=host, port=port, db=db)
+        await client.create_database(db=db)
 
         return InfluxStatCollector(client)