feat(status): раздел «Статус» — контейнеры, карточка, проверки (#14)
CI / ruff · mypy · pytest (pull_request) Successful in 1m11s
CI / ruff · mypy · pytest (pull_request) Successful in 1m11s
- docker-socket-proxy в Compose (только GET /containers/*), сокет только у него - app/runtime/docker.py: read-only клиент; видны только контейнеры с меткой tgit.managed=true, чужие id отклоняются до запроса - app/runtime/checks.py: running, health, рестарты за окно, CPU/RAM, ошибки в логе, HTTP-проба; у каждой проверки свой таймаут, отчёт всегда полный - app/runtime/snapshots.py: снапшоты раз в 15 с в container_snapshots - бот: список с 🟢🟡🔴⚪, карточка, «🩺 Запустить проверки», «🔄 Обновить» - деплой ставит метки tgit.sha / tgit.deployed_at на контейнер бота - имя джоба CD без неотрисованного выражения Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+28
-4
@@ -11,7 +11,7 @@ from app import __version__
|
||||
from app.access.service import AccessService
|
||||
from app.bot.fsm import make_storage
|
||||
from app.bot.middlewares.access import AccessMiddleware
|
||||
from app.bot.routers import commit, common, members
|
||||
from app.bot.routers import commit, common, members, status
|
||||
from app.config import Settings
|
||||
from app.db.maintenance import cleanup_loop
|
||||
from app.db.migrate import upgrade
|
||||
@@ -21,13 +21,22 @@ from app.logs_setup import setup_logging
|
||||
from app.repo.drafts import DraftService
|
||||
from app.repo.git import UploadsRepo
|
||||
from app.repo.publisher import Publisher
|
||||
from app.runtime.checks import Checker, load_checks
|
||||
from app.runtime.docker import DockerClient
|
||||
from app.runtime.snapshots import SnapshotStore, snapshot_loop
|
||||
from app.texts import Texts, load_texts
|
||||
|
||||
log = logging.getLogger("tgit")
|
||||
|
||||
|
||||
def build_dispatcher(
|
||||
texts: Texts, sessions: SessionMaker, access: AccessService, repo: UploadsRepo, commit_url_template: str = ""
|
||||
texts: Texts,
|
||||
sessions: SessionMaker,
|
||||
access: AccessService,
|
||||
repo: UploadsRepo,
|
||||
commit_url_template: str = "",
|
||||
docker: DockerClient | None = None,
|
||||
checker: Checker | None = None,
|
||||
) -> Dispatcher:
|
||||
dp = Dispatcher(storage=make_storage(sessions))
|
||||
gate = AccessMiddleware(access, texts)
|
||||
@@ -38,31 +47,42 @@ def build_dispatcher(
|
||||
dp.include_router(
|
||||
commit.build_router(texts, repo, DraftService(sessions), Publisher(repo, sessions), commit_url_template)
|
||||
)
|
||||
dp.include_router(status.build_router(texts, docker, checker))
|
||||
dp.include_router(common.build_router(texts, access))
|
||||
return dp
|
||||
|
||||
|
||||
async def run(settings: Settings) -> None:
|
||||
texts = load_texts(settings.runtime.config_dir)
|
||||
checks_cfg = load_checks(settings.runtime.config_dir)
|
||||
engine = make_engine(settings.database.url)
|
||||
await upgrade(engine)
|
||||
sessions = make_sessionmaker(engine)
|
||||
access = AccessService(sessions, settings.access)
|
||||
await access.bootstrap_admins()
|
||||
dp = build_dispatcher(texts, sessions, access, UploadsRepo(settings.git), settings.git.commit_url_template)
|
||||
# No DOCKER_URL (e.g. `make run` without Docker): «Статус» answers «Docker недоступен», the rest works
|
||||
docker = DockerClient(settings.docker) if settings.docker.url else None
|
||||
store = SnapshotStore(sessions)
|
||||
checker = Checker(docker, store, checks_cfg) if docker else None
|
||||
dp = build_dispatcher(
|
||||
texts, sessions, access, UploadsRepo(settings.git), settings.git.commit_url_template, docker, checker
|
||||
)
|
||||
rt = settings.runtime
|
||||
background = [
|
||||
asyncio.create_task(heartbeat(rt.heartbeat_file, rt.heartbeat_interval)),
|
||||
asyncio.create_task(cleanup_loop(sessions)),
|
||||
]
|
||||
if docker:
|
||||
background.append(asyncio.create_task(snapshot_loop(docker, store, settings.docker.snapshot_interval)))
|
||||
proxy = settings.telegram.proxy_url
|
||||
session = AiohttpSession(proxy=proxy.get_secret_value()) if proxy else None
|
||||
bot = Bot(settings.telegram.bot_token.get_secret_value(), session=session)
|
||||
log.info(
|
||||
"tgit %s starting, %d bootstrap admin(s), telegram %s",
|
||||
"tgit %s starting, %d bootstrap admin(s), telegram %s, docker %s",
|
||||
__version__,
|
||||
len(settings.access.admin_ids),
|
||||
"via proxy" if proxy else "direct",
|
||||
"on" if docker else "off",
|
||||
)
|
||||
try:
|
||||
await dp.start_polling(bot, handle_signals=True)
|
||||
@@ -73,6 +93,10 @@ async def run(settings: Settings) -> None:
|
||||
with contextlib.suppress(asyncio.CancelledError):
|
||||
await task
|
||||
await bot.session.close()
|
||||
if docker:
|
||||
await docker.aclose()
|
||||
if checker:
|
||||
await checker.aclose()
|
||||
await engine.dispose()
|
||||
log.info("tgit stopped")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user