Compare commits

...

4 Commits

4 changed files with 8 additions and 9 deletions

View File

@ -16,10 +16,8 @@ services:
- i18n:/i18n - i18n:/i18n
env_file: .env env_file: .env
environment: environment:
- SS_TYPE=memory # redis currently is broken - SS_TYPE=redis
- SS_REDIS_HOST=redis - SS_REDIS_HOST=redis
- SS_REDIS_PORT=6379
- SS_REDIS_PASSWORD=bot
redis: redis:
image: redis image: redis
@ -27,4 +25,4 @@ services:
volumes: volumes:
- redis-config:/etc/redis - redis-config:/etc/redis
- redis-data:/data - redis-data:/data
command: redis-server --save 20 1 --loglevel warning --requirepass bot command: redis-server --save 20 1

View File

@ -5,7 +5,7 @@ from sqlalchemy import pool
from alembic import context from alembic import context
from mybot.config import Config as AppConfig from mybot.config import load_config
from mybot.database import Base from mybot.database import Base
import mybot.database.models # do not delete this import mybot.database.models # do not delete this
@ -19,7 +19,7 @@ if config.config_file_name is not None:
target_metadata = Base.metadata target_metadata = Base.metadata
# set sqlalchemy.url since it can not be set in alembic.ini file # set sqlalchemy.url since it can not be set in alembic.ini file
app_config = AppConfig.from_env() app_config = load_config()
config.set_main_option("sqlalchemy.url", app_config.database.url) config.set_main_option("sqlalchemy.url", app_config.database.url)

View File

@ -72,10 +72,10 @@ class I18NConfig:
@dataclass @dataclass
class StateStorageConfig: class StateStorageConfig:
type: str type: str
redis_host: str redis_host: Optional[str]
redis_port: int redis_port: int
redis_db: int redis_db: int
redis_pass: str redis_pass: Optional[str]
@classmethod @classmethod
def from_env(cls): def from_env(cls):

View File

@ -3,6 +3,7 @@ pyyaml
sqlalchemy sqlalchemy
alembic alembic
psycopg psycopg
pymysql pymysql[rsa]
flask flask
gunicorn gunicorn
redis