From 74de8a07ee09fd0a2c2488d17bd27c085e5adbe8 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Thu, 18 Aug 2022 15:17:29 +0100
Subject: [PATCH] Gateway: Start adding types/checking

# Conflicts:
#	src/eddn/Gateway.py
---
 src/eddn/Gateway.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index e75e9b7..e42b7d3 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -11,6 +11,7 @@ import hashlib
 import logging
 import zlib
 from datetime import datetime
+from typing import Dict
 
 import gevent
 import simplejson
@@ -23,9 +24,6 @@ from pkg_resources import resource_string
 from eddn.conf.Settings import Settings, loadConfig
 from eddn.core.Validator import ValidationSeverity, Validator
 
-# import os
-
-
 monkey.patch_all()
 import bottle
 from bottle import Bottle, request, response
@@ -111,7 +109,7 @@ def extract_message_details(parsed_message):
 
     return uploader_id, software_name, software_version, schema_ref, journal_event
 
-def configure():
+def configure() -> None:
     """
     Get the list of transports to bind from settings.
 
@@ -125,7 +123,7 @@ def configure():
         validator.addSchemaResource(schema_ref, resource_string('eddn.Gateway', schema_file))
 
 
-def push_message(parsed_message, topic):
+def push_message(parsed_message: Dict, topic: str) -> None:
     """
     Push a message our to subscribed listeners.
 
@@ -139,7 +137,7 @@ def push_message(parsed_message, topic):
     # announcers with schema as topic
     compressed_msg = zlib.compress(string_message)
 
-    send_message = f"{str(topic)} |-| {compressed_msg}"
+    send_message = f"{str(topic)!r} |-| {compressed_msg!r}"
 
     sender.send(send_message)
     stats_collector.tally("outbound")
@@ -199,9 +197,8 @@ def parse_and_error_handle(data):
     """
     try:
         parsed_message = simplejson.loads(data)
-    except (
-        TypeError, ValueError
-    ) as exc:
+
+    except (MalformedUploadError, TypeError, ValueError) as exc:
         # Something bad happened. We know this will return at least a
         # semi-useful error message, so do so.
         try: