Add finer control for mongo/elastic/redis host configuration

server/service_repo/apicall.py

@@ -255,6 +255,7 @@ class MissingIdentity(Exception):
 class APICall(DataContainer):
     HEADER_AUTHORIZATION = "Authorization"
     HEADER_REAL_IP = "X-Real-IP"
+    HEADER_FORWARDED_FOR = "X-Forwarded-For"
     """ Standard headers """
 
     _transaction_headers = ("X-Trains-Trx",)
@@ -382,8 +383,13 @@ class APICall(DataContainer):
 
     @property
     def real_ip(self):
-        real_ip = self.get_header(self.HEADER_REAL_IP)
-        return real_ip or self._remote_addr or "untrackable"
+        """ Obtain visitor's IP address """
+        return (
+                self.get_header(self.HEADER_FORWARDED_FOR)
+                or self.get_header(self.HEADER_REAL_IP)
+                or self._remote_addr
+                or "untrackable"
+        )
 
     @property
     def failed(self):

server/service_repo/redis_manager.py

@@ -2,21 +2,23 @@ import threading
 from os import getenv
 from time import sleep
 
-from apierrors.errors.server_error import ConfigError, GeneralError
-from config import config
+from boltons.iterutils import first
 from redis import StrictRedis
 from redis.sentinel import Sentinel, SentinelConnectionPool
 
+from apierrors.errors.server_error import ConfigError, GeneralError
+from config import config
+
 log = config.logger(__file__)
 
-OVERRIDE_HOST_ENV_KEY = "REDIS_SERVICE_HOST"
-OVERRIDE_PORT_ENV_KEY = "REDIS_SERVICE_PORT"
+OVERRIDE_HOST_ENV_KEY = ("TRAINS_REDIS_SERVICE_HOST", "REDIS_SERVICE_HOST")
+OVERRIDE_PORT_ENV_KEY = ("TRAINS_REDIS_SERVICE_PORT", "REDIS_SERVICE_PORT")
 
-OVERRIDE_HOST = getenv(OVERRIDE_HOST_ENV_KEY)
+OVERRIDE_HOST = first(filter(None, map(getenv, OVERRIDE_HOST_ENV_KEY)))
 if OVERRIDE_HOST:
     log.info(f"Using override redis host {OVERRIDE_HOST}")
 
-OVERRIDE_PORT = getenv(OVERRIDE_PORT_ENV_KEY)
+OVERRIDE_PORT = first(filter(None, map(getenv, OVERRIDE_PORT_ENV_KEY)))
 if OVERRIDE_PORT:
     log.info(f"Using override redis port {OVERRIDE_PORT}")