third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-28 06:02:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gateway: Format with black

Browse Source 
# Conflicts:
#	src/eddn/Gateway.py
This commit is contained in:
Athanasius 2022-08-18 15:19:50 +01:00
parent 841c7e979e
commit 5d3358417d
No known key found for this signature in database
GPG Key ID: 8C392035DD80FD62
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/eddn/Gateway.py
View File

@ -1,4 +1,3 @@
# coding: utf8 # coding: utf8
""" """
@ -35,9 +34,7 @@ app = Bottle()
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
__logger_channel = logging.StreamHandler() __logger_channel = logging.StreamHandler()
__logger_formatter = logging.Formatter( __logger_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(module)s:%(lineno)d: %(message)s")
"%(asctime)s - %(levelname)s - %(module)s:%(lineno)d: %(message)s"
)
__logger_formatter.default_time_format = "%Y-%m-%d %H:%M:%S" __logger_formatter.default_time_format = "%Y-%m-%d %H:%M:%S"
__logger_formatter.default_msec_format = "%s.%03d" __logger_formatter.default_msec_format = "%s.%03d"
__logger_channel.setFormatter(__logger_formatter) __logger_channel.setFormatter(__logger_formatter)
@ -71,7 +68,8 @@ def parse_cl_args():
) )
parser.add_argument( parser.add_argument(
"-c", "--config", "-c",
"--config",
metavar="config filename", metavar="config filename",
nargs="?", nargs="?",
default=None, default=None,
@ -217,7 +215,7 @@ def parse_and_error_handle(data: bytes) -> str:
"<<UNKNOWN>>", "<<UNKNOWN>>",
"<<UNKNOWN>>", "<<UNKNOWN>>",
get_remote_address(), get_remote_address(),
data[:512] data[:512],
) )
except Exception as e: except Exception as e:
@ -233,8 +231,10 @@ def parse_and_error_handle(data: bytes) -> str:
if parsed_message["$schemaRef"] in Settings.GATEWAY_OUTDATED_SCHEMAS: if parsed_message["$schemaRef"] in Settings.GATEWAY_OUTDATED_SCHEMAS:
response.status = "426 Upgrade Required" # Bottle (and underlying httplib) don't know this one response.status = "426 Upgrade Required" # Bottle (and underlying httplib) don't know this one
stats_collector.tally("outdated") stats_collector.tally("outdated")
return "FAIL: Outdated Schema: The schema you have used is no longer supported. Please check for an updated " \ return (
"version of your application." "FAIL: Outdated Schema: The schema you have used is no longer supported. Please check for an updated "
"version of your application."
)
validation_results = validator.validate(parsed_message) validation_results = validator.validate(parsed_message)
@ -246,12 +246,18 @@ def parse_and_error_handle(data: bytes) -> str:
gevent.spawn(push_message, parsed_message, parsed_message["$schemaRef"]) gevent.spawn(push_message, parsed_message, parsed_message["$schemaRef"])
try: try:
uploader_id, software_name, software_version, schema_ref, journal_event = extract_message_details(parsed_message) # noqa: E501 (uploader_id, software_name, software_version, schema_ref, journal_event,) = extract_message_details(
parsed_message
) # noqa: E501
logger.info( logger.info(
"Accepted (%d, '%s', '%s', '%s', '%s', '%s') from %s", "Accepted (%d, '%s', '%s', '%s', '%s', '%s') from %s",
request.content_length, request.content_length,
uploader_id, software_name, software_version, schema_ref, journal_event, uploader_id,
get_remote_address() software_name,
software_version,
schema_ref,
journal_event,
get_remote_address(),
) )
except Exception as e: except Exception as e:
@ -263,13 +269,19 @@ def parse_and_error_handle(data: bytes) -> str:
else: else:
try: try:
uploader_id, software_name, software_version, schema_ref, journal_event = extract_message_details(parsed_message) # noqa: E501 (uploader_id, software_name, software_version, schema_ref, journal_event,) = extract_message_details(
parsed_message
) # noqa: E501
logger.error( logger.error(
"Failed Validation '%s' (%d, '%s', '%s', '%s', '%s', '%s') from %s", "Failed Validation '%s' (%d, '%s', '%s', '%s', '%s', '%s') from %s",
str(validation_results.messages), str(validation_results.messages),
request.content_length, request.content_length,
uploader_id, software_name, software_version, schema_ref, journal_event, uploader_id,
get_remote_address() software_name,
software_version,
schema_ref,
journal_event,
get_remote_address(),
) )
except Exception as e: except Exception as e:
@ -300,8 +312,8 @@ def upload() -> str:
response.status = 400 response.status = 400
try: try:
logger.error( logger.error(
f"gzip error ({request.content_length}, "<<UNKNOWN>>", "<<UNKNOWN>>", "<<UNKNOWN>>"," f"gzip error ({request.content_length}, '<<UNKNOWN>>', '<<UNKNOWN>>', '<<UNKNOWN>>'"
" "<<UNKNOWN>>", "<<UNKNOWN>>") from {get_remote_address()}" ", '<<UNKNOWN>>', '<<UNKNOWN>>') from {get_remote_address()}"
) )
except Exception as e: except Exception as e:
@ -369,17 +381,11 @@ def apply_cors() -> None:
:param context: :param context:
:return: :return:
""" """
response.set_header( response.set_header("Access-Control-Allow-Origin", "*")
"Access-Control-Allow-Origin", response.set_header("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS")
"*"
)
response.set_header(
"Access-Control-Allow-Methods",
"GET, POST, PUT, OPTIONS"
)
response.set_header( response.set_header(
"Access-Control-Allow-Headers", "Access-Control-Allow-Headers",
"Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token" "Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token",
) )
@ -398,7 +404,7 @@ def main() -> None:
port=Settings.GATEWAY_HTTP_PORT, port=Settings.GATEWAY_HTTP_PORT,
server="gevent", server="gevent",
certfile=Settings.CERT_FILE, certfile=Settings.CERT_FILE,
keyfile=Settings.KEY_FILE keyfile=Settings.KEY_FILE,
) )