Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master

tmtccli.py

@@ -26,6 +26,7 @@ limitations under the License.
 
 @author     R. Mueller
 """
+import logging
 import sys
 import traceback
 
@@ -35,8 +36,8 @@ try:
         run_tmtc_commander,
         add_ccsds_handler,
     )
-    from tmtccmd.ccsds.handler import CcsdsTmHandler
-    from tmtccmd.logging import TMTC_LOGGER_NAME
+    from tmtccmd.ccsds.handler import CcsdsTmHandler, ApidHandler
+    from tmtccmd.logging import init_console_logger
 except ImportError as error:
     run_tmtc_commander = None
     initialize_tmtc_commander = None
@@ -47,7 +48,6 @@ except ImportError as error:
 
 try:
     import spacepackets
-    from spacepackets.log import set_custom_console_logger_name
 except ImportError as error:
     print(error)
     print("Python spacepackets module could not be imported")
@@ -63,17 +63,14 @@ from pus_tm.factory_hook import ccsds_tm_handler
 
 
 def main():
-    from pus_tm.event_handler import handle_event_packet
-
     hook_obj = EiveHookObject()
     print(f"-- eive tmtc version {__version__} --")
     print(f"-- spacepackets version {spacepackets.__version__} --")
-    set_custom_console_logger_name(logger_name=TMTC_LOGGER_NAME)
     initialize_tmtc_commander(hook_object=hook_obj)
     ccsds_handler = CcsdsTmHandler()
-    ccsds_handler.add_tm_handler(
-        apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50
-    )
+    init_console_logger()
+    pus_handler = ApidHandler(cb=ccsds_tm_handler, queue_len=50, user_args=None)
+    ccsds_handler.add_tm_handler(apid=PUS_APID, handler=pus_handler)
     add_ccsds_handler(ccsds_handler)
     run_tmtc_commander(False)