Merge pull request #102 from slaclab/mysql

Mysql Support
slaclab · Nov 14, 2017 · f72fed9 · f72fed9
2 parents 7c52c45 + 8aa1e09
commit f72fed9
Show file tree

Hide file tree

Showing 4 changed files with 423 additions and 4 deletions.
diff --git a/Readme_python3.txt b/Readme_python3.txt
@@ -71,6 +71,7 @@ Other python packages
 > pip3 install PyYAML
 > pip3 install Pyro4 
 > pip3 install parse 
+> pip3 install mysqlclient
 > pip3 install recordclass
 > pip3 install click
 
diff --git a/python/pyrogue/_Root.py b/python/pyrogue/_Root.py
@@ -196,7 +196,7 @@ def _getPath(self,path):
         obj = self
         if '.' in path:
             for a in path.split('.')[1:]:
-                obj = getattr(obj, a)
+                obj = obj.node(a)
 
         return obj
 
@@ -283,7 +283,7 @@ def setDisp(self,path,value):
     @Pyro4.expose
     def exec(self,path,arg):
         obj = self.getNode(path)
-        return obj(arg)
+        return obj.call(arg)
 
     def setTimeout(self,timeout):
         """

diff --git a/python/pyrogue/epics.py b/python/pyrogue/epics.py
@@ -72,8 +72,10 @@ def __init__(self,*,base,root,pvMap=None):
 
     def stop(self):
         self._runEn = False
-        self._wThread.join()
-        self._eThread.join()
+        if self._wThread is not None:
+            self._wThread.join()
+        if self._eThread is not None:
+            self._eThread.join()
         self._wThread = None
         self._eThread = None