Redoing the config parser

Author: jimi-c

docs/source/intro.rst

@@ -82,9 +82,9 @@ following configuration:
 In the video below you'll see these 3 nodes launched in a ``tmux`` 4-pane layout
 with the following commands::
 
-  $ receptor controller --socket-path=/tmp/receptor.sock --listen-port=8888 --node-id=controller
-  $ receptor node --listen-port=8889 --peer=localhost:8888 --node-id=node-a
-  $ receptor node --listen-port=8890 --peer=localhost:8889 --node-id=node-b
+  $ receptor -d /tmp/controller controller --socket-path=/tmp/receptor.sock --listen-port=8888 --node-id=controller
+  $ receptor -d /tmp/node-a node --listen-port=8889 --peer=localhost:8888 --node-id=node-a
+  $ receptor -d /tmp/node-b node --listen-port=8890 --peer=localhost:8889 --node-id=node-b
 
 In the last pane we execute the ``ping`` command::
 

receptor/__main__.py

@@ -2,166 +2,17 @@
 import datetime
 import logging
 import logging.config
-from .config import ReceptorConfig, DEFAULT_CONFIG
+
+from .config import ReceptorConfig
 from .receptor import Receptor
-from . import node
-from . import controller
 
 logger = logging.getLogger(__name__)
 
 
-def map_args_to_config(args):
-    to_return = {}
-    if getattr(args, 'listen_address', None):
-        to_return.setdefault('server', {})['address'] = args.listen_address
-    if getattr(args, 'listen_port', None):
-        to_return.setdefault('server', {})['port'] = args.listen_port
-    if getattr(args, 'server_enable', None):
-        to_return.setdefault('server', {})['server_enable'] = args.server_enable
-    if getattr(args, 'debug', None):
-        to_return.setdefault('server', {})['debug'] = args.debug
-    if getattr(args, 'ssl_certificate', None):
-        to_return.setdefault('server', {})['ssl_certificate'] = args.ssl_certificate
-    if getattr(args, 'ssl_key', None):
-        to_return.setdefault('server', {})['ssl_key'] = args.ssl_key
-    if getattr(args, 'data_dir', None):
-        to_return.setdefault('server', {})['data_dir'] = args.data_dir
-    if getattr(args, 'peer', None):
-        to_return['peers'] = {peer: '' for peer in args.peer}
-    if getattr(args, 'node_id', None):
-        to_return.setdefault('receptor', {})['node_id'] = args.node_id
-    return to_return
-
-
-def run_as_controller(args):
-    config = ReceptorConfig(args.config, map_args_to_config(args))
-    receptor = Receptor(config)
-    logger.info(f'Starting up as node ID {receptor.node_id}')
-    controller.mainloop(receptor, args.socket_path)
-
-
-def run_as_ping(args):
-    logger.info(f'Sending ping to {args.recipient}.')
-    now = datetime.datetime.utcnow()
-    controller.send_directive('receptor:ping', args.recipient, now.isoformat(), args.socket_path)
-
-
-def run_as_send(args):
-    logger.info(f'Sending a {args.directive} directive to {args.recipient}.')
-    controller.send_directive(args.directive, args.recipient, args.payload, args.socket_path)
-
-
-def run_as_node(args):
-    config = ReceptorConfig(args.config, map_args_to_config(args))
-    receptor = Receptor(config)
-    logger.info("Running as Receptor node with ID: {}".format(receptor.node_id))
-    node.mainloop(receptor, args.ping_interval)
-
-
 def main(args=None):
-    parser = argparse.ArgumentParser("receptor")
-    parser.add_argument(
-        "-c", "--config", default="/etc/receptor/receptor.conf",
-        help='Path to configuration file')
-    parser.add_argument(
-        "--debug", action="store_true", default=False,
-        help='Emit debugging output')
-    parser.add_argument(
-        '--ssl_certificate',
-        help="Certificate Chain File"
-    )
-    parser.add_argument(
-        "-d", "--data_dir", default="/var/lib/receptor",
-        help='Path to the directory where Receptor stores its database and metadata')
-    parser.add_argument(
-        '--ssl_key',
-        help="Certificate Key File"
-    )
-    subparsers = parser.add_subparsers(
-        title='subcommands')
 
-    subparser_node = subparsers.add_parser(
-        'node',
-        help='Run a Receptor node')
-    subparser_node.add_argument(
-        "--listen-address",
-        help=f'Set/override IP address to listen on. If not set here or in a config file, the default is {DEFAULT_CONFIG["server"]["address"]}')
-    subparser_node.add_argument(
-        "--listen-port",
-        help=f'Set/override TCP port to listen on. If not set here or in a config file, the default is {DEFAULT_CONFIG["server"]["port"]}')
-    subparser_node.add_argument(
-        "-p", "--peer", action='append',
-        help=f'Set/override peer nodes/controllers to connect to. Use multiple times for multiple peers.')
-    subparser_node.add_argument(
-        "--node-id",
-        help='Set/override node identifier. If unspecified here or in a config file, one will be automatically generated.')
-    subparser_node.add_argument(
-        "--server-disable", action="store_true", default=False,
-        help="Disable the server function and only connect to configured peers.")
-    subparser_node.add_argument(
-        '--ping-interval', metavar="N", type=int,
-        help="If specified, the node will ping all other known nodes in the mesh every N seconds."
-    )
-    subparser_node.set_defaults(func=run_as_node)
+    config = ReceptorConfig(args)
 
-    subparser_controller = subparsers.add_parser(
-        'controller',
-        help='Run a Receptor controller'
-    )
-    subparser_controller.add_argument(
-        '--socket-path', default='/var/run/receptor_controller.sock',
-        help='Path to control socket'
-    )
-    subparser_controller.add_argument(
-        "--listen-address",
-        help=f'Set/override IP address to listen on. If not set here or in a config file, the default is {DEFAULT_CONFIG["server"]["address"]}')
-    subparser_controller.add_argument(
-        "--listen-port",
-        help=f'Set/override TCP port to listen on. If not set here or in a config file, the default is {DEFAULT_CONFIG["server"]["port"]}')
-    subparser_controller.add_argument(
-        "--node-id",
-        help='Set/override node identifier. If unspecified here or in a config file, one will be automatically generated.')
-    subparser_controller.set_defaults(func=run_as_controller)
-
-    subparser_ping = subparsers.add_parser(
-        'ping',
-        help='Tell the local controller to ping a node'
-    )
-    subparser_ping.add_argument(
-        '--socket-path', default='/var/run/receptor_controller.sock',
-        help='Path to control socket'
-    )
-    subparser_ping.add_argument(
-        'recipient',
-        help='Node ID of the Receptor node or controller to ping'
-    )
-    subparser_ping.set_defaults(func=run_as_ping)
-
-    subparser_send = subparsers.add_parser(
-        'send',
-        help='Send a directive to a node'
-    )
-    subparser_send.add_argument(
-        '--socket-path', default='/var/run/receptor_controller.sock',
-        help='Path to control socket'
-    )
-    subparser_send.add_argument(
-        '--directive',
-        help='Directive to send'
-    )
-    subparser_send.add_argument(
-        '--recipient',
-        help='Node ID of the Receptor node or controller to direct'
-    )
-    subparser_send.add_argument(
-        'payload',
-        help='Payload of the directive to send. Use - for stdin.'
-    )
-    subparser_send.set_defaults(func=run_as_send)
-   
-
-    args = parser.parse_args(args)
-    
     logging.config.dictConfig(
         {
             'version': 1,
@@ -181,12 +32,13 @@ def main(args=None):
             'loggers': {
                 'receptor': {
                     'handlers': ['console'],
-                    'level': 'DEBUG' if args.debug else 'INFO',
+                    'level': 'DEBUG' if config.default_debug else 'INFO',
                 },
             },
         }
     )
-    args.func(args)
+
+    config.go()
 
 
 if __name__ == '__main__':

receptor/buffers/file.py

@@ -21,7 +21,7 @@ class FileBuffer(BaseBuffer):
     def __init__(self, node_id, receptor):
         super().__init__(node_id, receptor)
         self.node_id = node_id
-        self.base_path = os.path.join(os.path.expanduser(self.receptor.config.server.data_dir))
+        self.base_path = os.path.join(os.path.expanduser(self.receptor.config.default_data_dir))
         self.message_path = os.path.join(self.base_path, self.receptor.node_id, "messages")
         self.manifest_path = os.path.join(self.base_path, self.receptor.node_id, "manifest-{}".format(node_id))
         if not os.path.exists(self.message_path):