diff --git a/selfprivacy_api/graphql/queries/system.py b/selfprivacy_api/graphql/queries/system.py index 112fa8c..cc30fd7 100644 --- a/selfprivacy_api/graphql/queries/system.py +++ b/selfprivacy_api/graphql/queries/system.py @@ -136,7 +136,7 @@ def get_system_provider_info() -> SystemProviderInfo: with ReadUserData() as user_data: return SystemProviderInfo( provider=user_data["server"]["provider"], - id="UNKNOWN" + id="UNKNOWN", ) diff --git a/selfprivacy_api/utils/redis_pool.py b/selfprivacy_api/utils/redis_pool.py index a87049c..2f2cf21 100644 --- a/selfprivacy_api/utils/redis_pool.py +++ b/selfprivacy_api/utils/redis_pool.py @@ -3,6 +3,7 @@ Redis pool module for selfprivacy_api """ import redis from selfprivacy_api.utils.singleton_metaclass import SingletonMetaclass +from os import environ REDIS_SOCKET = "/run/redis-sp-api/redis.sock" @@ -13,10 +14,18 @@ class RedisPool(metaclass=SingletonMetaclass): """ def __init__(self): - self._pool = redis.ConnectionPool.from_url( - f"unix://{REDIS_SOCKET}", - decode_responses=True, - ) + if "USE_REDIS_PORT" in environ.keys(): + self._pool = redis.ConnectionPool( + host="127.0.0.1", + port=int(environ["USE_REDIS_PORT"]), + decode_responses=True, + ) + + else: + self._pool = redis.ConnectionPool.from_url( + f"unix://{REDIS_SOCKET}", + decode_responses=True, + ) self._pubsub_connection = self.get_connection() def get_connection(self): diff --git a/shell.nix b/shell.nix index b6d8e32..4589192 100644 --- a/shell.nix +++ b/shell.nix @@ -64,9 +64,14 @@ pkgs.mkShell { buildInputs = [ sp-python pkgs.black + pkgs.redis ]; shellHook = '' PYTHONPATH=${sp-python}/${sp-python.sitePackages} + # envs set with export and as attributes are treated differently. + # for example. printenv will not fetch the value of an attribute. + export USE_REDIS_PORT=6379 + redis-server --port $USE_REDIS_PORT >/dev/null & # maybe set more env-vars ''; }