beremiz

Fix crash in runtime if PSK secret is missing

2019-03-13, Andrey Skvortsov
a3ec35ee94e7
Fix crash in runtime if PSK secret is missing

./Beremiz_service.py -s $PWD/psk2.txt -n beremiz /tmp/beremiz
Beremiz_service: 1.2-1378c18402c3+

Traceback (most recent call last):
File "./Beremiz_service.py", line 511, in
ensurePSK(servicename, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 32, in ensurePSK
PSKgen(ID, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 23, in PSKgen
call(restart_stunnel_cmdline)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/spawn_subprocess.py", line 116, in call
pid = posix_spawn.posix_spawnp(cmd[0], cmd)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 120, in posix_spawnp
return _posix_spawn(lib.posix_spawnp, *args, **kwargs)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 111, in _posix_spawn
_check_error(res, path)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 10, in _check_error
raise OSError(errno, os.strerror(errno), path)
OSError: [Errno 2] No such file or directory: '/etc/init.d/S50stunnel'
// import Nevow.Athena
// import Divmod.Base
function updateAttr(id, param, value) {
Nevow.Athena.Widget.fromAthenaID(1).callRemote('HMIexec', 'setattr', id, param, value);
}
var svguiWidgets = new Array();
var currentObject = null;
function setCurrentObject(obj) {
currentObject = obj;
}
function isCurrentObject(obj) {
return currentObject == obj;
}
function getSVGElementById(id) {
return document.getElementById(id);
}
function blockSVGElementDrag(element) {
element.addEventListener("draggesture", function(event){event.stopPropagation()}, true);
}
LiveSVGPage.LiveSVGWidget = Nevow.Athena.Widget.subclass('LiveSVGPage.LiveSVGWidget');
LiveSVGPage.LiveSVGWidget.methods(
function handleEvent(self, evt) {
if (currentObject != null) {
currentObject.handleEvent(evt);
}
},
function receiveData(self, data){
dataReceived = json_parse(data);
gadget = svguiWidgets[dataReceived.id]
if (gadget) {
gadget.updateValues(json_parse(dataReceived.kwargs));
}
//console.log("OBJET : " + dataReceived.back_id + " STATE : " + newState);
},
function init(self, arg1){
//console.log("Object received : " + arg1);
for (ind in arg1) {
gad = json_parse(arg1[ind]);
args = json_parse(gad.kwargs);
gadget = new svguilib[gad.__class__](self, gad.id, args);
svguiWidgets[gadget.id]=gadget;
//console.log('GADGET :' + gadget);
}
var elements = document.getElementsByTagName("svg");
for (var i = 0; i < elements.length; i++) {
elements[i].addEventListener("mouseup", self, false);
}
//console.log("SVGUIWIDGETS : " + svguiWidgets);
}
);