Merge pull request #28 from jimi-c/better_malformed_directive_handling

Better malformed directive handling

Author: matburt

receptor/__main__.py

@@ -2,6 +2,7 @@
 import datetime
 import logging
 import logging.config
+import sys
 
 from .config import ReceptorConfig
 from .receptor import Receptor
@@ -11,7 +12,11 @@
 
 def main(args=None):
 
-    config = ReceptorConfig(args)
+    try:
+        config = ReceptorConfig(args)
+    except Exception as e:
+        logger.error("An error occured while validating the configuration options:\n%s" % (str(e),))
+        sys.exit(1)
 
     logging.config.dictConfig(
         {
@@ -38,7 +43,11 @@ def main(args=None):
         }
     )
 
-    config.go()
+    try:
+        config.go()
+    except Exception as e:
+        logger.error("An error occured while running receptor:\n%s" % (str(e),))
+        sys.exit(1)
 
 
 if __name__ == '__main__':

receptor/connection.py

@@ -1,6 +1,7 @@
 import asyncio
-import logging
 import json
+import logging
+
 from . import exceptions
 from .messages import envelope, directive
 from .exceptions import ReceptorBufferError
@@ -75,7 +76,20 @@ async def handle_message(self, msg):
                     else:
                         # other namespace/work directives
                         await self.receptor.work_manager.handle(outer_env.inner_obj)
+                except ValueError:
+                    logger.error("error in handle_message: Invalid directive -> '%s'. Sending failure response back." % (outer_env.inner_obj.directive,))
+                    err_resp = outer_env.inner_obj.make_response(
+                        receptor=self.receptor,
+                        recipient=outer_env.inner_obj.sender,
+                        payload="An invalid directive ('%s') was specified." % (outer_env.inner_obj.directive,),
+                        in_response_to=outer_env.inner_obj.message_id,
+                        serial=outer_env.inner_obj.serial + 1,
+                        ttl=15,
+                        code=1,
+                    )
+                    await self.receptor.router.send(err_resp)
                 except Exception as e:
+                    logger.error("error in handle_message: '%s'. Sending failure response back." % (str(e),))
                     err_resp = outer_env.inner_obj.make_response(
                         receptor=self.receptor,
                         recipient=outer_env.inner_obj.sender,

receptor/entrypoints.py

@@ -5,8 +5,9 @@
 import time
 
 from .receptor import Receptor
-from . import node
 from . import controller
+from . import exceptions
+from . import node
 
 logger = logging.getLogger(__name__)
 
@@ -53,6 +54,13 @@ def run_as_send(config):
     logger.info(f'Sending a {config.send_directive} directive to {config.send_recipient}.')
     sock = controller.connect_to_socket(config.send_socket_path)
     try:
+        if config.send_directive in (None, ''):
+            raise exceptions.UnknownDirective("The directive cannot be left out when using send.")
+        else:
+            try:
+                left, right = config.send_directive.split(':', 1)
+            except ValueError:
+                raise exceptions.UnknownDirective("Invalid directive format (%s). Directives must be in the form `action:method`." % (config.send_directive,))
         response = controller.send_directive(config.send_directive, config.send_recipient, config.send_payload, sock)
         sys.stdout.buffer.write(response + b"\n")
         sys.stdout.flush()