From 39058653cb49e1f797a1c4274899d03b4472456b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 14 Mar 2022 14:21:22 +0000 Subject: [PATCH] More file re-arrangement, concentrating on running from source With `import eddn.core.Validator` and the like it was actually picking up the egg versions of the files, not local ones. Currently this will run as per: cd src/eddn python Gateway.py --config ~/.local/share/eddn/dev/config.json --- setup.py | 12 ++++++------ src/{ => eddn}/Gateway.py | 19 +++++-------------- src/{ => eddn}/Monitor.py | 0 src/{ => eddn}/Relay.py | 0 src/eddn/conf/Settings.py | 2 +- src/eddn/core/logger.py | 12 ++++++++++++ src/{ => eddn}/schemas/README-EDDN-schemas.md | 0 .../schemas/TEMPLATES/journalevent-README.md | 0 .../schemas/TEMPLATES/journalevent-v1.0.json | 0 .../schemas/approachsettlement-README.md | 0 .../schemas/approachsettlement-v1.0.json | 0 src/{ => eddn}/schemas/blackmarket-README.md | 0 src/{ => eddn}/schemas/blackmarket-v1.0.json | 0 src/{ => eddn}/schemas/codexentry-README.md | 0 src/{ => eddn}/schemas/codexentry-v1.0.json | 0 src/{ => eddn}/schemas/commodity-README.md | 0 src/{ => eddn}/schemas/commodity-v3.0.json | 0 .../schemas/fssallbodiesfound-README.md | 0 .../schemas/fssallbodiesfound-v1.0.json | 0 .../schemas/fssdiscoveryscan-README.md | 0 .../schemas/fssdiscoveryscan-v1.0.json | 0 src/{ => eddn}/schemas/journal-README.md | 0 src/{ => eddn}/schemas/journal-v1.0.json | 0 .../schemas/navbeaconscan-README.md | 0 .../schemas/navbeaconscan-v1.0.json | 0 src/{ => eddn}/schemas/navroute-README.md | 0 src/{ => eddn}/schemas/navroute-v1.0.json | 0 src/{ => eddn}/schemas/outfitting-README.md | 0 src/{ => eddn}/schemas/outfitting-v2.0.json | 0 .../schemas/scanbarycentre-README.md | 0 .../schemas/scanbarycentre-v1.0.json | 0 src/{ => eddn}/schemas/shipyard-README.md | 0 src/{ => eddn}/schemas/shipyard-v2.0.json | 0 33 files changed, 24 insertions(+), 21 deletions(-) rename src/{ => eddn}/Gateway.py (95%) rename src/{ => eddn}/Monitor.py (100%) rename src/{ => eddn}/Relay.py (100%) create mode 100644 src/eddn/core/logger.py rename src/{ => eddn}/schemas/README-EDDN-schemas.md (100%) rename src/{ => eddn}/schemas/TEMPLATES/journalevent-README.md (100%) rename src/{ => eddn}/schemas/TEMPLATES/journalevent-v1.0.json (100%) rename src/{ => eddn}/schemas/approachsettlement-README.md (100%) rename src/{ => eddn}/schemas/approachsettlement-v1.0.json (100%) rename src/{ => eddn}/schemas/blackmarket-README.md (100%) rename src/{ => eddn}/schemas/blackmarket-v1.0.json (100%) rename src/{ => eddn}/schemas/codexentry-README.md (100%) rename src/{ => eddn}/schemas/codexentry-v1.0.json (100%) rename src/{ => eddn}/schemas/commodity-README.md (100%) rename src/{ => eddn}/schemas/commodity-v3.0.json (100%) rename src/{ => eddn}/schemas/fssallbodiesfound-README.md (100%) rename src/{ => eddn}/schemas/fssallbodiesfound-v1.0.json (100%) rename src/{ => eddn}/schemas/fssdiscoveryscan-README.md (100%) rename src/{ => eddn}/schemas/fssdiscoveryscan-v1.0.json (100%) rename src/{ => eddn}/schemas/journal-README.md (100%) rename src/{ => eddn}/schemas/journal-v1.0.json (100%) rename src/{ => eddn}/schemas/navbeaconscan-README.md (100%) rename src/{ => eddn}/schemas/navbeaconscan-v1.0.json (100%) rename src/{ => eddn}/schemas/navroute-README.md (100%) rename src/{ => eddn}/schemas/navroute-v1.0.json (100%) rename src/{ => eddn}/schemas/outfitting-README.md (100%) rename src/{ => eddn}/schemas/outfitting-v2.0.json (100%) rename src/{ => eddn}/schemas/scanbarycentre-README.md (100%) rename src/{ => eddn}/schemas/scanbarycentre-v1.0.json (100%) rename src/{ => eddn}/schemas/shipyard-README.md (100%) rename src/{ => eddn}/schemas/shipyard-v2.0.json (100%) diff --git a/setup.py b/setup.py index 65379a1..cb6488f 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,7 @@ setup( package_dir={"": "src"}, # This includes them for the running code, but that doesn't help # serve them up for reference. - data_files=[("eddn/src/schemas", glob.glob("src/schemas/*.json"))], + data_files=[("eddn/schemas", glob.glob("src/eddn/schemas/*.json"))], # Yes, we pin versions. With python2.7 the latest pyzmq will NOT # work, for instance. install_requires=[ @@ -99,10 +99,10 @@ setup( ], entry_points={ "console_scripts": [ - "eddn-gateway = Gateway:main", - "eddn-relay = Relay:main", - "eddn-monitor = Monitor:main", - "eddn-bouncer = Bouncer:main", + "eddn-gateway = eddn.Gateway:main", + "eddn-relay = eddn.Relay:main", + "eddn-monitor = eddn.Monitor:main", + "eddn-bouncer = eddn.Bouncer:main", ], }, ) @@ -220,7 +220,7 @@ except OSError: pass shutil.copytree( - "src/schemas", + "src/eddn/schemas", SHARE_EDDN_FILES / "schemas", copy_function=shutil.copyfile, # type: ignore ) diff --git a/src/Gateway.py b/src/eddn/Gateway.py similarity index 95% rename from src/Gateway.py rename to src/eddn/Gateway.py index 03ef34d..91acc79 100644 --- a/src/Gateway.py +++ b/src/eddn/Gateway.py @@ -20,8 +20,9 @@ from gevent import monkey from pkg_resources import resource_string from zmq import PUB as ZMQ_PUB -from eddn.conf.Settings import Settings, load_config -from eddn.core.Validator import ValidationSeverity, Validator +from conf.Settings import Settings, load_config +from core.Validator import ValidationSeverity, Validator +from core.logger import logger monkey.patch_all() import bottle # noqa: E402 @@ -30,18 +31,8 @@ from bottle import Bottle, request, response # noqa: E402 bottle.BaseRequest.MEMFILE_MAX = 1024 * 1024 # 1MiB, default is/was 100KiB app = Bottle() - -logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) -__logger_channel = logging.StreamHandler() -__logger_formatter = logging.Formatter("%(asctime)s - %(levelname)s - Gateway - %(module)s:%(lineno)d: %(message)s") -__logger_formatter.default_time_format = "%Y-%m-%d %H:%M:%S" -__logger_formatter.default_msec_format = "%s.%03d" -__logger_channel.setFormatter(__logger_formatter) -logger.addHandler(__logger_channel) logger.info("Made logger") - # This socket is used to push market data out to the Announcers over ZeroMQ. zmq_context = zmq.Context() sender = zmq_context.socket(ZMQ_PUB) @@ -49,8 +40,8 @@ sender = zmq_context.socket(ZMQ_PUB) validator = Validator() # This import must be done post-monkey-patching! -from eddn.core.StatsCollector import StatsCollector # noqa: E402 -from eddn.core.EDDNWSGIHandler import EDDNWSGIHandler +from core.StatsCollector import StatsCollector # noqa: E402 +from core.EDDNWSGIHandler import EDDNWSGIHandler stats_collector = StatsCollector() stats_collector.start() diff --git a/src/Monitor.py b/src/eddn/Monitor.py similarity index 100% rename from src/Monitor.py rename to src/eddn/Monitor.py diff --git a/src/Relay.py b/src/eddn/Relay.py similarity index 100% rename from src/Relay.py rename to src/eddn/Relay.py diff --git a/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py index 48c02d2..31b0f3c 100644 --- a/src/eddn/conf/Settings.py +++ b/src/eddn/conf/Settings.py @@ -5,7 +5,7 @@ from typing import Dict import simplejson -from eddn.conf.Version import __version__ as version +from conf.Version import __version__ as version class _Settings(object): diff --git a/src/eddn/core/logger.py b/src/eddn/core/logger.py new file mode 100644 index 0000000..d9c950e --- /dev/null +++ b/src/eddn/core/logger.py @@ -0,0 +1,12 @@ +"""Common logging setup.""" +# vim: tw=120 wm=120 ts=4 sw=4 smarttab smartindent expandtab +import logging + +logger = logging.getLogger() +logger.setLevel(logging.INFO) +__logger_channel = logging.StreamHandler() +__logger_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(filename)s - %(module)s:%(lineno)d: %(message)s") +__logger_formatter.default_time_format = "%Y-%m-%d %H:%M:%S" +__logger_formatter.default_msec_format = "%s.%03d" +__logger_channel.setFormatter(__logger_formatter) +logger.addHandler(__logger_channel) diff --git a/src/schemas/README-EDDN-schemas.md b/src/eddn/schemas/README-EDDN-schemas.md similarity index 100% rename from src/schemas/README-EDDN-schemas.md rename to src/eddn/schemas/README-EDDN-schemas.md diff --git a/src/schemas/TEMPLATES/journalevent-README.md b/src/eddn/schemas/TEMPLATES/journalevent-README.md similarity index 100% rename from src/schemas/TEMPLATES/journalevent-README.md rename to src/eddn/schemas/TEMPLATES/journalevent-README.md diff --git a/src/schemas/TEMPLATES/journalevent-v1.0.json b/src/eddn/schemas/TEMPLATES/journalevent-v1.0.json similarity index 100% rename from src/schemas/TEMPLATES/journalevent-v1.0.json rename to src/eddn/schemas/TEMPLATES/journalevent-v1.0.json diff --git a/src/schemas/approachsettlement-README.md b/src/eddn/schemas/approachsettlement-README.md similarity index 100% rename from src/schemas/approachsettlement-README.md rename to src/eddn/schemas/approachsettlement-README.md diff --git a/src/schemas/approachsettlement-v1.0.json b/src/eddn/schemas/approachsettlement-v1.0.json similarity index 100% rename from src/schemas/approachsettlement-v1.0.json rename to src/eddn/schemas/approachsettlement-v1.0.json diff --git a/src/schemas/blackmarket-README.md b/src/eddn/schemas/blackmarket-README.md similarity index 100% rename from src/schemas/blackmarket-README.md rename to src/eddn/schemas/blackmarket-README.md diff --git a/src/schemas/blackmarket-v1.0.json b/src/eddn/schemas/blackmarket-v1.0.json similarity index 100% rename from src/schemas/blackmarket-v1.0.json rename to src/eddn/schemas/blackmarket-v1.0.json diff --git a/src/schemas/codexentry-README.md b/src/eddn/schemas/codexentry-README.md similarity index 100% rename from src/schemas/codexentry-README.md rename to src/eddn/schemas/codexentry-README.md diff --git a/src/schemas/codexentry-v1.0.json b/src/eddn/schemas/codexentry-v1.0.json similarity index 100% rename from src/schemas/codexentry-v1.0.json rename to src/eddn/schemas/codexentry-v1.0.json diff --git a/src/schemas/commodity-README.md b/src/eddn/schemas/commodity-README.md similarity index 100% rename from src/schemas/commodity-README.md rename to src/eddn/schemas/commodity-README.md diff --git a/src/schemas/commodity-v3.0.json b/src/eddn/schemas/commodity-v3.0.json similarity index 100% rename from src/schemas/commodity-v3.0.json rename to src/eddn/schemas/commodity-v3.0.json diff --git a/src/schemas/fssallbodiesfound-README.md b/src/eddn/schemas/fssallbodiesfound-README.md similarity index 100% rename from src/schemas/fssallbodiesfound-README.md rename to src/eddn/schemas/fssallbodiesfound-README.md diff --git a/src/schemas/fssallbodiesfound-v1.0.json b/src/eddn/schemas/fssallbodiesfound-v1.0.json similarity index 100% rename from src/schemas/fssallbodiesfound-v1.0.json rename to src/eddn/schemas/fssallbodiesfound-v1.0.json diff --git a/src/schemas/fssdiscoveryscan-README.md b/src/eddn/schemas/fssdiscoveryscan-README.md similarity index 100% rename from src/schemas/fssdiscoveryscan-README.md rename to src/eddn/schemas/fssdiscoveryscan-README.md diff --git a/src/schemas/fssdiscoveryscan-v1.0.json b/src/eddn/schemas/fssdiscoveryscan-v1.0.json similarity index 100% rename from src/schemas/fssdiscoveryscan-v1.0.json rename to src/eddn/schemas/fssdiscoveryscan-v1.0.json diff --git a/src/schemas/journal-README.md b/src/eddn/schemas/journal-README.md similarity index 100% rename from src/schemas/journal-README.md rename to src/eddn/schemas/journal-README.md diff --git a/src/schemas/journal-v1.0.json b/src/eddn/schemas/journal-v1.0.json similarity index 100% rename from src/schemas/journal-v1.0.json rename to src/eddn/schemas/journal-v1.0.json diff --git a/src/schemas/navbeaconscan-README.md b/src/eddn/schemas/navbeaconscan-README.md similarity index 100% rename from src/schemas/navbeaconscan-README.md rename to src/eddn/schemas/navbeaconscan-README.md diff --git a/src/schemas/navbeaconscan-v1.0.json b/src/eddn/schemas/navbeaconscan-v1.0.json similarity index 100% rename from src/schemas/navbeaconscan-v1.0.json rename to src/eddn/schemas/navbeaconscan-v1.0.json diff --git a/src/schemas/navroute-README.md b/src/eddn/schemas/navroute-README.md similarity index 100% rename from src/schemas/navroute-README.md rename to src/eddn/schemas/navroute-README.md diff --git a/src/schemas/navroute-v1.0.json b/src/eddn/schemas/navroute-v1.0.json similarity index 100% rename from src/schemas/navroute-v1.0.json rename to src/eddn/schemas/navroute-v1.0.json diff --git a/src/schemas/outfitting-README.md b/src/eddn/schemas/outfitting-README.md similarity index 100% rename from src/schemas/outfitting-README.md rename to src/eddn/schemas/outfitting-README.md diff --git a/src/schemas/outfitting-v2.0.json b/src/eddn/schemas/outfitting-v2.0.json similarity index 100% rename from src/schemas/outfitting-v2.0.json rename to src/eddn/schemas/outfitting-v2.0.json diff --git a/src/schemas/scanbarycentre-README.md b/src/eddn/schemas/scanbarycentre-README.md similarity index 100% rename from src/schemas/scanbarycentre-README.md rename to src/eddn/schemas/scanbarycentre-README.md diff --git a/src/schemas/scanbarycentre-v1.0.json b/src/eddn/schemas/scanbarycentre-v1.0.json similarity index 100% rename from src/schemas/scanbarycentre-v1.0.json rename to src/eddn/schemas/scanbarycentre-v1.0.json diff --git a/src/schemas/shipyard-README.md b/src/eddn/schemas/shipyard-README.md similarity index 100% rename from src/schemas/shipyard-README.md rename to src/eddn/schemas/shipyard-README.md diff --git a/src/schemas/shipyard-v2.0.json b/src/eddn/schemas/shipyard-v2.0.json similarity index 100% rename from src/schemas/shipyard-v2.0.json rename to src/eddn/schemas/shipyard-v2.0.json