Allow enterprise ID to contain sub-identifiers

Author: jobec

rfc5424logging/handler.py

@@ -165,9 +165,10 @@ def __init__(
             structured_data (dict):
                 A dictionary with structured data that is added to every message. Per message your
                 can add more structured data by adding it to the ``extra`` argument of the log function.
-            enterprise_id (int):
+            enterprise_id (str):
                 The Private Enterprise Number. This is used to compose the structured data IDs when
-                they do not include an Enterprise ID and are not one of the reserved structured data IDs
+                they do not include an Enterprise ID and are not one of the reserved structured data IDs.
+                Can be a single PEN like ``32473`` or optionally contain sub-identifiers like ``32473.2.6``
             utc_timestamp (bool):
                 Whether the timestamp should be converted to UTC time or kept in the local timezone
             timeout (int):

tests/test_structured_data.py

@@ -129,6 +129,11 @@
         b'<14>1 2000-01-01T17:11:11.111111+06:00 testhostname root 111'
         b' - [timeQuality isSynced="1"]'
         b' \xef\xbb\xbfThis is an interesting message'
+    ), (  # 22
+        {'address': address, 'enterprise_id': "32473.1.2"},
+        {'extra': {'structured_data': sd1_no_pen}},
+        b'<14>1 2000-01-01T17:11:11.111111+06:00 testhostname root 111'
+        b' - [my_sd_id1@32473.1.2 my_key1="my_value1"] \xef\xbb\xbfThis is an interesting message'
     ),
 ])
 def test_sd(logger, handler_kwargs, logger_kwargs, expected):