Moving node_id to default config section

Also fixing a few minor bugs introduced by the rebase with master.

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 -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
+  $ receptor --node-id=controller -d /tmp/controller controller --socket-path=/tmp/receptor.sock --listen-port=8888
+  $ receptor --node-id=node-a -d /tmp/node-a node --listen-port=8889 --peer=localhost:8888
+  $ receptor --node-id=node-b -d /tmp/node-b node --listen-port=8890 --peer=localhost:8889
 
 In the last pane we execute the ``ping`` command::
 

receptor/config.py

@@ -55,6 +55,14 @@ def __init__(self, args=None):
         self._config_file = configparser.ConfigParser(allow_no_value=True, delimiters=('=',))
 
         # Default options, which apply to all sub-commands.
+        self.add_config_option(
+            section='default',
+            key='node_id',
+            #long_option='--node-id',
+            default_value='',
+            value_type='str',
+            hint='Set/override node identifier. If unspecified here or in a config file, one will be automatically generated.',
+        )
         self.add_config_option(
             section='default',
             key='config',
@@ -112,14 +120,6 @@ def __init__(self, args=None):
             value_type='int',
             hint='Set/override TCP port to listen on. If not set here or in a config file, the default is 8888.',
         )
-        self.add_config_option(
-            section='node',
-            key='id',
-            long_option='--node-id',
-            default_value='',
-            value_type='str',
-            hint='Set/override node identifier. If unspecified here or in a config file, one will be automatically generated.',
-        )
         self.add_config_option(
             section='node',
             key='peers',

receptor/entrypoints.py

@@ -27,5 +27,5 @@ def run_as_send(config):
 
 def run_as_node(config):
     receptor = Receptor(config)
-    logger.info("Running as Receptor node with ID: {}".format(receptor.node_id))
+    logger.info(f'Running as Receptor node with ID: {receptor.node_id}')
     node.mainloop(receptor, config.node_ping_interval)

receptor/receptor.py

@@ -17,12 +17,12 @@ class Receptor:
     def __init__(self, config, node_id=None, router_cls=None,
                  work_manager_cls=None):
         self.config = config
-        self.node_id = node_id or self.config.node_id or self._find_node_id()
+        self.node_id = node_id or self.config.default_node_id or self._find_node_id()
         self.router = (router_cls or MeshRouter)(self)
         self.work_manager = (work_manager_cls or WorkManager)(self)
         self.connections = dict()
         self.controller_connections = []
-        self.connection_manifest_path = os.path.join(self.config.server.data_dir,
+        self.connection_manifest_path = os.path.join(self.config.default_data_dir,
                                                      self.node_id,
                                                      "connection_manifest")
         self.stop = False
@@ -41,7 +41,7 @@ async def watch_expire(self):
         while True:
             current_manifest = self.get_connection_manifest()
             for connection in current_manifest:
-                buffer = self.config.components.buffer_manager.get_buffer_for_node(connection["id"], self)
+                buffer = self.config.components_buffer_manager.get_buffer_for_node(connection["id"], self)
                 for ident, message in buffer:
                     message_actual = json.loads(message)
                     if "expire_time" in message_actual and message_actual['expire_time'] < time.time():