Skip to content
Snippets Groups Projects
Commit fc491493 authored by wactbprot's avatar wactbprot
Browse files

vxi11 trouble ii

parent efd3c7e2
No related branches found
No related tags found
No related merge requests found
......@@ -34,9 +34,10 @@ chart :{
port: 55555
},
system : {
heartbeat: 300,
par_delay_mult: 80, // Multiplikator
db_delay_mult: 80 // Multiplikator
heartbeat: 200,
par_delay_mult: 100, // Multiplikator
db_delay_mult: 200, // Multiplikator
vxi11_buffer_time: 100
},
container : {
heartbeat:300
......
......@@ -50,7 +50,8 @@ module.exports = function (path, s, p, task){
mem.publish("worker", exec, function (err){
if(!err){
if(ok){
var delay = parseInt(p, 10) * conf.system.par_delay_mult;
// +1 in order to never get a 0 delay
var delay = (parseInt(p, 10)+1) * conf.system.par_delay_mult;
setTimeout(function (){
log.trace(ro
, "start " + tsknm
......
......@@ -31,8 +31,12 @@ module.exports = function (task, cb){
var wrtdata = JSON.stringify(task);
net.relay(function(err, con){
request.exec(con, task, wrtdata, function (err, data){
log.trace(ro,
"start vxi11_buffer_time before processing data received from relayServer");
// delay data processing, testing vxi-11
setTimeout(function(){
log.trace(ro,
"end vxi11_buffer_time before processing data received from relayServer");
if(!data && err){
log.error(err
, "received error in callback");
......@@ -87,7 +91,7 @@ module.exports = function (task, cb){
} //!dp && ep
} // else data.ok
} // data.error
},500); // wait before process data, vxi11 testing
}, conf.system.vxi11_buffer_time); // wait before process data, vxi11 testing
}); // exec
}); // net con
}else{
......
......@@ -2,7 +2,7 @@
"author": "wactbprot",
"name": "ssmp",
"description": "server side measurment program",
"version": "1.7.0",
"version": "1.8.0",
"repository": {
"type": "git",
"url": "https://github.com/wactbprot/ssmp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment