From 103c8a660508d2161b58232736f7ef4d57e0b827 Mon Sep 17 00:00:00 2001 From: "Antonio J. Delgado" Date: Tue, 23 Jan 2024 20:51:17 +0200 Subject: [PATCH] fix error in dict and add exception --- .../discover_mastodon_servers.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/discover-mastodon-servers/discover_mastodon_servers.py b/discover-mastodon-servers/discover_mastodon_servers.py index 26bf23a..ced3be4 100755 --- a/discover-mastodon-servers/discover_mastodon_servers.py +++ b/discover-mastodon-servers/discover_mastodon_servers.py @@ -12,7 +12,6 @@ from logging.handlers import SysLogHandler import sqlite3 import time import re -import json import click import click_config_file import requests @@ -83,7 +82,7 @@ class DiscoverMastodonServers: self._log.debug( "Server '%s' didn't return Content-Type header. Headers: '%s'. Content returned: '%s'", server['name'], - json.dumps(result.headers, indent=2), + result.headers, result.content ) else: @@ -119,6 +118,14 @@ class DiscoverMastodonServers: server['name'], error ) + except Exception as error: + server['state'] = 'Error' + self._log.warning( + "Error fetching endpoint '%s' from server '%s'. %s", + endpoint, + server['name'], + error + ) return data def get_instance_info(self, server): @@ -189,7 +196,7 @@ class DiscoverMastodonServers: } ) else: - server[1]['peers'] = False + server['peers'] = False self._log.debug("Fetching public timeline in server '%s'", server_name) data = self.get_timeline(server) if data: @@ -233,6 +240,8 @@ class DiscoverMastodonServers: record['peers'] = True if 'timeline' not in record: record['timeline'] = True + if 'last_update' not in record: + record['last_update'] = time.time() cur = self.conn.cursor() result_select = cur.execute(f""" SELECT name FROM {table} WHERE name = '{record['name']}'