diff --git a/ansible/roles/celery_task/templates/consul_service.json b/ansible/roles/celery_task/templates/consul_service.json index 7d8568079..0bffee83f 100644 --- a/ansible/roles/celery_task/templates/consul_service.json +++ b/ansible/roles/celery_task/templates/consul_service.json @@ -1,6 +1,7 @@ { "service": { - "name": "{{ item.service_name }}", + "name": "{{ inventory_hostname|regex_replace('\d+', '') }}", + "id": "{{ inventory_hostname }}", "tags": [ "celery_task" ] diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py index fa465b1fe..7d888546d 100644 --- a/utils/feed_fetcher.py +++ b/utils/feed_fetcher.py @@ -168,7 +168,7 @@ class FetchFeed: agent=self.feed.user_agent, etag=etag, modified=modified) - except (TypeError, ValueError, KeyError, EOFError, MemoryError, urllib.error.URLError) as e: + except (TypeError, ValueError, KeyError, EOFError, MemoryError, urllib.error.URLError, ConnectionResetError) as e: logging.debug(' ***> [%-30s] ~FRFeed fetch error: %s' % (self.feed.log_title[:30], e)) pass