Fix: python lttngust agent fails when LTTNG_UST_APP_PATH is not set

[lttng-ust.git] / src / python-lttngust / lttngust / agent.py

diff --git a/src/python-lttngust/lttngust/agent.py b/src/python-lttngust/lttngust/agent.py
index 69caad69492d66d0e7b1a2a4a83c530c3547fea8..d0c1af7ca8eab3883129e9e889012d48735d7cd2 100644 (file)
--- a/src/python-lttngust/lttngust/agent.py
+++ b/src/python-lttngust/lttngust/agent.py
@@ -267,7 +267,13 @@ def _get_port_from_file(path):
     return port
 
 def _get_ust_app_path():
-    return os.getenv('LTTNG_UST_APP_PATH')
+    paths = os.getenv('LTTNG_UST_APP_PATH')
+    if paths is None:
+        return paths
+    paths = paths.split(':')
+    if len(paths) > 1:
+        dbg._pwarning("':' separator in LTTNG_UST_APP_PATH, only the first path will be used")
+    return paths[0]
 
 def _get_user_home_path():
     # $LTTNG_HOME overrides $HOME if it exists
@@ -310,6 +316,7 @@ def _init_threads():
         user_port = None
         dbg._pdebug('ust_app session daemon port: {}'.format(ust_app_port))
     else:
+        ust_app_port = None
         sys_port = _get_port_from_file('/var/run/lttng/agent.port')
         user_port_file = os.path.join(_get_user_home_path(), '.lttng', 'agent.port')
         user_port = _get_port_from_file(user_port_file)
@@ -326,7 +333,7 @@ def _init_threads():
         sys_port = None
 
     try:
-     if ust_app_port is not None:
+        if ust_app_port is not None:
             dbg._pdebug('creating ust_app client thread')
             t = threading.Thread(target=_client_thread_target,
                                  args=('ust_app', ust_app_port, reg_queue))