[openrtm-commit:02479] r799 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-02-22 15:04:19 +0900 (Wed, 22 Feb 2017)
New Revision: 799

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
Log:
[compat,->RELENG_1_2] refs #3967

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2017-02-17 06:25:51 UTC (rev 798)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2017-02-22 06:04:19 UTC (rev 799)
@@ -81,6 +81,7 @@
                  "manager.modules.C++.manager_cmd", "rtcd",
                  "manager.modules.Python.manager_cmd", "rtcd_python",
                  "manager.modules.Java.manager_cmd", "rtcd_java",
+                 "manager.modules.search_auto", "YES",
                  "manager.local_service.enabled_services","ALL",
                  "sdo.service.provider.enabled_service",  "ALL",
                  "sdo.service.consumer.enabled_service",  "ALL",

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-02-17 06:25:51 UTC (rev 798)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-02-22 06:04:19 UTC (rev 799)
@@ -843,6 +843,8 @@
       self._rtcout.RTC_ERROR("createComponent: Factory not found: %s",
                              comp_id.getProperty("implementation_id"))
 
+      if not OpenRTM_aist.toBool(self._config.getProperty("manager.modules.search_auto"), "YES", "NO", True):
+        return False
       # automatic module loading
       mp = self._module.getLoadableModules()
       self._rtcout.RTC_INFO("%d loadable modules found", len(mp))

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py	2017-02-17 06:25:51 UTC (rev 798)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py	2017-02-22 06:04:19 UTC (rev 799)
@@ -19,7 +19,7 @@
 
 import threading
 import logging
-import logging.handlers
+
 import OpenRTM_aist
 
 
@@ -179,9 +179,9 @@
     self._LogLock = False
     self._log_enable = False
     self._loggerObj = None
-    name = ""
 
 
+
     self._mutex = threading.RLock()
     self._loggerObj = []
     self._log_enable = True