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

Merge pull request #64 from Marginal/end-migration

Browse Source 
Retire old schemas
This commit is contained in:
AnthorNet 2017-08-09 13:46:04 +02:00 committed by GitHub
commit f12c936d08
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eddn/Gateway.py
View File

@ -37,11 +37,6 @@ statsCollector = StatsCollector()
statsCollector.start() statsCollector.start()
# Migration from schemas.elite-markets.net to eddn.edcd.io - Remove after transition complete!
import re
TRANSITION_RE = re.compile('^https://eddn.edcd.io/schemas/(.+)')
def configure(): def configure():
# Get the list of transports to bind from settings. This allows us to PUB # Get the list of transports to bind from settings. This allows us to PUB
# messages to multiple announcers over a variety of socket types # messages to multiple announcers over a variety of socket types
@ -150,11 +145,6 @@ def parse_and_error_handle(data):
if validationResults.severity <= ValidationSeverity.WARN: if validationResults.severity <= ValidationSeverity.WARN:
parsed_message['header']['gatewayTimestamp'] = datetime.utcnow().isoformat() + 'Z' parsed_message['header']['gatewayTimestamp'] = datetime.utcnow().isoformat() + 'Z'
# Migration from schemas.elite-markets.net to eddn.edcd.io - Remove after transition complete!
match = TRANSITION_RE.match(parsed_message['$schemaRef'])
if match and match.group(1):
parsed_message['$schemaRef'] = 'http://schemas.elite-markets.net/eddn/%s' % match.group(1)
ip_hash_salt = Settings.GATEWAY_IP_KEY_SALT ip_hash_salt = Settings.GATEWAY_IP_KEY_SALT
if ip_hash_salt: if ip_hash_salt:
# If an IP hash is set, salt+hash the uploader's IP address and set # If an IP hash is set, salt+hash the uploader's IP address and set

20
src/eddn/conf/Settings.py
View File

@ -49,28 +49,18 @@ class _Settings(object):
GATEWAY_IP_KEY_SALT = None GATEWAY_IP_KEY_SALT = None
GATEWAY_JSON_SCHEMAS = { GATEWAY_JSON_SCHEMAS = {
"http://schemas.elite-markets.net/eddn/commodity/3" : "schemas/commodity-v3.0.json",
"http://schemas.elite-markets.net/eddn/commodity/3/test" : "schemas/commodity-v3.0.json",
"https://eddn.edcd.io/schemas/commodity/3" : "schemas/commodity-v3.0.json", "https://eddn.edcd.io/schemas/commodity/3" : "schemas/commodity-v3.0.json",
"https://eddn.edcd.io/schemas/commodity/3/test" : "schemas/commodity-v3.0.json", "https://eddn.edcd.io/schemas/commodity/3/test" : "schemas/commodity-v3.0.json",
"http://schemas.elite-markets.net/eddn/shipyard/2" : "schemas/shipyard-v2.0.json",
"http://schemas.elite-markets.net/eddn/shipyard/2/test" : "schemas/shipyard-v2.0.json",
"https://eddn.edcd.io/schemas/shipyard/2" : "schemas/shipyard-v2.0.json", "https://eddn.edcd.io/schemas/shipyard/2" : "schemas/shipyard-v2.0.json",
"https://eddn.edcd.io/schemas/shipyard/2/test" : "schemas/shipyard-v2.0.json", "https://eddn.edcd.io/schemas/shipyard/2/test" : "schemas/shipyard-v2.0.json",
"http://schemas.elite-markets.net/eddn/outfitting/2" : "schemas/outfitting-v2.0.json",
"http://schemas.elite-markets.net/eddn/outfitting/2/test" : "schemas/outfitting-v2.0.json",
"https://eddn.edcd.io/schemas/outfitting/2" : "schemas/outfitting-v2.0.json", "https://eddn.edcd.io/schemas/outfitting/2" : "schemas/outfitting-v2.0.json",
"https://eddn.edcd.io/schemas/outfitting/2/test" : "schemas/outfitting-v2.0.json", "https://eddn.edcd.io/schemas/outfitting/2/test" : "schemas/outfitting-v2.0.json",
"http://schemas.elite-markets.net/eddn/blackmarket/1" : "schemas/blackmarket-v1.0.json",
"http://schemas.elite-markets.net/eddn/blackmarket/1/test" : "schemas/blackmarket-v1.0.json",
"https://eddn.edcd.io/schemas/blackmarket/1" : "schemas/blackmarket-v1.0.json", "https://eddn.edcd.io/schemas/blackmarket/1" : "schemas/blackmarket-v1.0.json",
"https://eddn.edcd.io/schemas/blackmarket/1/test" : "schemas/blackmarket-v1.0.json", "https://eddn.edcd.io/schemas/blackmarket/1/test" : "schemas/blackmarket-v1.0.json",
"http://schemas.elite-markets.net/eddn/journal/1" : "schemas/journal-v1.0.json",
"http://schemas.elite-markets.net/eddn/journal/1/test" : "schemas/journal-v1.0.json",
"https://eddn.edcd.io/schemas/journal/1" : "schemas/journal-v1.0.json", "https://eddn.edcd.io/schemas/journal/1" : "schemas/journal-v1.0.json",
"https://eddn.edcd.io/schemas/journal/1/test" : "schemas/journal-v1.0.json", "https://eddn.edcd.io/schemas/journal/1/test" : "schemas/journal-v1.0.json",
} }
@ -80,10 +70,20 @@ class _Settings(object):
"http://schemas.elite-markets.net/eddn/commodity/1/test", "http://schemas.elite-markets.net/eddn/commodity/1/test",
"http://schemas.elite-markets.net/eddn/commodity/2", "http://schemas.elite-markets.net/eddn/commodity/2",
"http://schemas.elite-markets.net/eddn/commodity/2/test", "http://schemas.elite-markets.net/eddn/commodity/2/test",
"http://schemas.elite-markets.net/eddn/commodity/3",
"http://schemas.elite-markets.net/eddn/commodity/3/test",
"http://schemas.elite-markets.net/eddn/outfitting/1", "http://schemas.elite-markets.net/eddn/outfitting/1",
"http://schemas.elite-markets.net/eddn/outfitting/1/test", "http://schemas.elite-markets.net/eddn/outfitting/1/test",
"http://schemas.elite-markets.net/eddn/outfitting/2",
"http://schemas.elite-markets.net/eddn/outfitting/2/test",
"http://schemas.elite-markets.net/eddn/shipyard/1", "http://schemas.elite-markets.net/eddn/shipyard/1",
"http://schemas.elite-markets.net/eddn/shipyard/1/test", "http://schemas.elite-markets.net/eddn/shipyard/1/test",
"http://schemas.elite-markets.net/eddn/shipyard/2",
"http://schemas.elite-markets.net/eddn/shipyard/2/test",
"http://schemas.elite-markets.net/eddn/blackmarket/1",
"http://schemas.elite-markets.net/eddn/blackmarket/1/test",
"http://schemas.elite-markets.net/eddn/journal/1",
"http://schemas.elite-markets.net/eddn/journal/1/test",
] ]
############################################################################### ###############################################################################