From 1a6741ec1057a4695d9a52dbe7c2a1f652377880 Mon Sep 17 00:00:00 2001 From: Kobe Date: Mon, 23 Jun 2025 11:06:54 +0200 Subject: [PATCH] remove versions for now --- routes/__pycache__/main.cpython-313.pyc | Bin 104187 -> 102529 bytes routes/main.py | 38 +---------------- templates/main/instances.html | 52 ------------------------ 3 files changed, 1 insertion(+), 89 deletions(-) diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc index 4ededb4c6a5d74464df0e89f4d3f1eec6731fcf4..b35635bc476549eb86fce43b8ea527ca8c6ea135 100644 GIT binary patch delta 7858 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 diff --git a/routes/main.py b/routes/main.py index 00b7168..838ef6e 100644 --- a/routes/main.py +++ b/routes/main.py @@ -386,46 +386,10 @@ def init_routes(main_bp): gitea_repo = git_settings.get('repo') if git_settings else None for instance in instances: - # 1. Check status + # Check status status_info = check_instance_status(instance) instance.status = status_info['status'] instance.status_details = status_info['details'] - - # 2. Check deployed version - deployed_version = None - deployed_tag = None - deployed_commit = None - try: - version_url = f"{instance.main_url.rstrip('/')}/api/version" - resp = requests.get(version_url, timeout=30) # Increased timeout to 30 seconds - if resp.status_code == 200: - version_data = resp.json() - deployed_version = version_data.get('version', 'unknown') - deployed_tag = version_data.get('tag', 'unknown') - deployed_commit = version_data.get('commit', 'unknown') - except Exception as e: - deployed_version = None - deployed_tag = None - deployed_commit = None - - instance.deployed_version = deployed_tag or deployed_version or 'unknown' - instance.deployed_branch = instance.deployed_branch or 'master' - - # 3. Check latest version from Gitea (if settings available) - latest_version = None - deployed_branch = instance.deployed_branch or 'master' - if gitea_url and gitea_token and gitea_repo: - try: - headers = {'Accept': 'application/json', 'Authorization': f'token {gitea_token}'} - # Gitea API: /api/v1/repos/{owner}/{repo}/commits/{branch} - commit_url = f"{gitea_url}/api/v1/repos/{gitea_repo}/commits/{deployed_branch}" - commit_resp = requests.get(commit_url, headers=headers, timeout=30) # Increased timeout to 30 seconds - if commit_resp.status_code == 200: - latest_version = commit_resp.json().get('sha') - except Exception as e: - latest_version = None - instance.latest_version = latest_version or 'unknown' - instance.version_checked_at = datetime.utcnow() db.session.commit() diff --git a/templates/main/instances.html b/templates/main/instances.html index 29d9202..b9aad53 100644 --- a/templates/main/instances.html +++ b/templates/main/instances.html @@ -5,19 +5,6 @@ {% block extra_css %}