This commit is contained in:
parent
ab39b534fe
commit
071d8217dd
|
@ -5,9 +5,6 @@ from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from auth.identity import Password
|
from auth.identity import Password
|
||||||
from services.db import Base
|
from services.db import Base
|
||||||
from settings import ADMIN_EMAILS
|
|
||||||
|
|
||||||
# from sqlalchemy_utils import TSVectorType
|
|
||||||
|
|
||||||
# Общие table_args для всех моделей
|
# Общие table_args для всех моделей
|
||||||
DEFAULT_TABLE_ARGS = {"extend_existing": True}
|
DEFAULT_TABLE_ARGS = {"extend_existing": True}
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"include": ["."],
|
|
||||||
"exclude": ["**/node_modules", "**/__pycache__", "**/.*", "**/dist"],
|
|
||||||
"defineConstant": {
|
|
||||||
"DEBUG": true
|
|
||||||
},
|
|
||||||
"venvPath": ".",
|
|
||||||
"venv": ".venv",
|
|
||||||
"pythonVersion": "3.11",
|
|
||||||
"typeCheckingMode": "strict",
|
|
||||||
"reportMissingImports": true,
|
|
||||||
"reportMissingTypeStubs": false,
|
|
||||||
"reportUnknownMemberType": false,
|
|
||||||
"reportUnknownParameterType": false,
|
|
||||||
"reportUnknownVariableType": false,
|
|
||||||
"reportUnknownArgumentType": false,
|
|
||||||
"reportPrivateUsage": false,
|
|
||||||
"reportUntypedFunctionDecorator": false
|
|
||||||
}
|
|
|
@ -74,14 +74,26 @@ class ViewedStorage:
|
||||||
if not redis._client:
|
if not redis._client:
|
||||||
await redis.connect()
|
await redis.connect()
|
||||||
|
|
||||||
|
# Логируем настройки Redis соединения
|
||||||
|
logger.info(f" * Redis connection: {redis._client}")
|
||||||
|
|
||||||
# Получаем список всех ключей migrated_views_* и находим самый последний
|
# Получаем список всех ключей migrated_views_* и находим самый последний
|
||||||
keys = await redis.execute("KEYS", "migrated_views_*")
|
keys = await redis.execute("KEYS", "migrated_views_*")
|
||||||
|
logger.info(f" * Raw Redis result for 'KEYS migrated_views_*': {len(keys)}")
|
||||||
|
|
||||||
|
# Декодируем байтовые строки, если есть
|
||||||
|
if keys and isinstance(keys[0], bytes):
|
||||||
|
keys = [k.decode('utf-8') for k in keys]
|
||||||
|
logger.info(f" * Decoded keys: {keys}")
|
||||||
|
|
||||||
if not keys:
|
if not keys:
|
||||||
logger.warning(" * No migrated_views keys found in Redis")
|
logger.warning(" * No migrated_views keys found in Redis")
|
||||||
return
|
return
|
||||||
|
|
||||||
# Фильтруем только ключи timestamp формата (исключаем migrated_views_slugs)
|
# Фильтруем только ключи timestamp формата (исключаем migrated_views_slugs)
|
||||||
timestamp_keys = [k for k in keys if k != "migrated_views_slugs"]
|
timestamp_keys = [k for k in keys if k != "migrated_views_slugs"]
|
||||||
|
logger.info(f" * Timestamp keys after filtering: {timestamp_keys}")
|
||||||
|
|
||||||
if not timestamp_keys:
|
if not timestamp_keys:
|
||||||
logger.warning(" * No migrated_views timestamp keys found in Redis")
|
logger.warning(" * No migrated_views timestamp keys found in Redis")
|
||||||
return
|
return
|
||||||
|
@ -90,6 +102,7 @@ class ViewedStorage:
|
||||||
timestamp_keys.sort()
|
timestamp_keys.sort()
|
||||||
latest_key = timestamp_keys[-1]
|
latest_key = timestamp_keys[-1]
|
||||||
self.redis_views_key = latest_key
|
self.redis_views_key = latest_key
|
||||||
|
logger.info(f" * Selected latest key: {latest_key}")
|
||||||
|
|
||||||
# Получаем метку времени создания для установки start_date
|
# Получаем метку времени создания для установки start_date
|
||||||
timestamp = await redis.execute("HGET", latest_key, "_timestamp")
|
timestamp = await redis.execute("HGET", latest_key, "_timestamp")
|
||||||
|
@ -110,6 +123,8 @@ class ViewedStorage:
|
||||||
if total_entries:
|
if total_entries:
|
||||||
logger.info(f" * {total_entries} shouts with views loaded from Redis key: {latest_key}")
|
logger.info(f" * {total_entries} shouts with views loaded from Redis key: {latest_key}")
|
||||||
|
|
||||||
|
logger.info(f" * Found migrated_views keys: {keys}")
|
||||||
|
|
||||||
# noinspection PyTypeChecker
|
# noinspection PyTypeChecker
|
||||||
@staticmethod
|
@staticmethod
|
||||||
async def update_pages():
|
async def update_pages():
|
||||||
|
|
Loading…
Reference in New Issue
Block a user