diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py index 9a961c6..e036150 100644 --- a/src/eddn/Gateway.py +++ b/src/eddn/Gateway.py @@ -11,7 +11,7 @@ import zlib import zmq.green as zmq from eddn import __version__ as EDDN_VERSION from eddn.conf import Settings -from eddn.Validator import validate, ValidationSeverity +from eddn.Validator import Validator, ValidationSeverity from gevent import monkey monkey.patch_all() @@ -28,6 +28,8 @@ sender = context.socket(zmq.PUB) for binding in Settings.GATEWAY_SENDER_BINDINGS: sender.bind(binding) +validator = Validator() + def push_message(string_message): """ @@ -110,7 +112,7 @@ def parse_and_error_handle(data): logger.error("Error to %s: %s" % (get_remote_address(), exc.message)) return exc.message - validationResults = validate(parsed_message) + validationResults = validator.validate(parsed_message) if validationResults.severity <= ValidationSeverity.WARN: diff --git a/src/eddn/Validator.py b/src/eddn/Validator.py index b9608b6..2c8eff5 100644 --- a/src/eddn/Validator.py +++ b/src/eddn/Validator.py @@ -1,13 +1,15 @@ from enum import IntEnum -def validate(json_object): - results = ValidationResults() +class Validator(object): - if "$schemaRef" not in json_object: - results.add(ValidationSeverity.FATAL, JsonValidationException("No $schemaRef found, unable to validate.")) + def validate(self, json_object): + results = ValidationResults() - return results + if "$schemaRef" not in json_object: + results.add(ValidationSeverity.FATAL, JsonValidationException("No $schemaRef found, unable to validate.")) + + return results class ValidationSeverity(IntEnum):