Bug fix to reload created piCtory configuration, while daemon is running

This commit is contained in:
2020-06-23 12:04:59 +02:00
parent e7c6899101
commit 6c32e81b9f
4 changed files with 14 additions and 15 deletions

View File

@@ -4,12 +4,13 @@
<inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true"> <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ourVersions"> <option name="ourVersions">
<value> <value>
<list size="5"> <list size="6">
<item index="0" class="java.lang.String" itemvalue="3.4" /> <item index="0" class="java.lang.String" itemvalue="3.4" />
<item index="1" class="java.lang.String" itemvalue="3.5" /> <item index="1" class="java.lang.String" itemvalue="3.5" />
<item index="2" class="java.lang.String" itemvalue="3.6" /> <item index="2" class="java.lang.String" itemvalue="3.6" />
<item index="3" class="java.lang.String" itemvalue="3.7" /> <item index="3" class="java.lang.String" itemvalue="3.7" />
<item index="4" class="java.lang.String" itemvalue="3.8" /> <item index="4" class="java.lang.String" itemvalue="3.8" />
<item index="5" class="java.lang.String" itemvalue="3.9" />
</list> </list>
</value> </value>
</option> </option>

3
.idea/misc.xml generated
View File

@@ -4,4 +4,7 @@
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (revpi)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (revpi)" project-jdk-type="Python SDK" />
<component name="PythonCompatibilityInspectionAdvertiser">
<option name="version" value="3" />
</component>
</project> </project>

View File

@@ -48,9 +48,7 @@ class ProcimgServer():
} }
# RevPiModIO laden oder mit Exception aussteigen # RevPiModIO laden oder mit Exception aussteigen
ex = self.loadrevpimodio() self.loadrevpimodio()
if ex is not None:
raise ex
proginit.logger.debug("leave ProcimgServer.__init__()") proginit.logger.debug("leave ProcimgServer.__init__()")

View File

@@ -445,17 +445,14 @@ class RevPiPyLoad():
"".format(min_revpimodio) "".format(min_revpimodio)
) )
else: else:
try: self.xml_ps = procimgserver.ProcimgServer(
self.xml_ps = procimgserver.ProcimgServer( self.xsrv,
self.xsrv, None if not self.replace_ios_config
None if not self.replace_ios_config else self.replace_ios_config,
else self.replace_ios_config, )
)
self.xsrv.register_function(1, self.xml_psstart, "psstart") self.xsrv.register_function(1, self.xml_psstart, "psstart")
self.xsrv.register_function(1, self.xml_psstop, "psstop") self.xsrv.register_function(1, self.xml_psstop, "psstop")
except Exception as e:
self.xml_ps = None
proginit.logger.error(e)
# XML Modus 2 Einstellungen lesen und Programm herunterladen # XML Modus 2 Einstellungen lesen und Programm herunterladen
self.xsrv.register_function( self.xsrv.register_function(