@iobroker/js-controller-adapter 4.0.9-alpha.4-20220211-0162da93 → 4.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/adapter.js"],"names":[],"mappings":";AAuDA;;;;;;;;;GASG;AACH,kCAHW,MAAM,GAAC,MAAM,GACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/adapter.js"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,10 @@ function Adapter(options) {
|
|
|
56
56
|
config = fs.readJSONSync(configFileName);
|
|
57
57
|
config.states = config.states || { type: 'file' };
|
|
58
58
|
config.objects = config.objects || { type: 'file' };
|
|
59
|
+
// Make sure the DB has enough time (5s). JsonL can take a bit longer if the process just crashed before
|
|
60
|
+
// because the lockfile might not have been freed.
|
|
61
|
+
config.states.connectTimeout = Math.max(config.states.connectTimeout || 0, 5000);
|
|
62
|
+
config.objects.connectTimeout = Math.max(config.objects.connectTimeout || 0, 5000);
|
|
59
63
|
}
|
|
60
64
|
else {
|
|
61
65
|
throw new Error(`Cannot find ${configFileName}`);
|
|
@@ -1163,7 +1167,7 @@ function Adapter(options) {
|
|
|
1163
1167
|
this.log.warn(`setInterval called, but adapter is shutting down`);
|
|
1164
1168
|
return;
|
|
1165
1169
|
}
|
|
1166
|
-
const id = setInterval(() => cb(...args));
|
|
1170
|
+
const id = setInterval(() => cb(...args), timeout);
|
|
1167
1171
|
intervals.add(id);
|
|
1168
1172
|
return id;
|
|
1169
1173
|
};
|
|
@@ -1288,6 +1292,9 @@ function Adapter(options) {
|
|
|
1288
1292
|
* Called if states and objects successfully initalized
|
|
1289
1293
|
*/
|
|
1290
1294
|
const prepareInitAdapter = () => {
|
|
1295
|
+
if (this.terminated) {
|
|
1296
|
+
return;
|
|
1297
|
+
}
|
|
1291
1298
|
if (options.instance !== undefined) {
|
|
1292
1299
|
initAdapter(options);
|
|
1293
1300
|
}
|
|
@@ -1386,7 +1393,7 @@ function Adapter(options) {
|
|
|
1386
1393
|
else {
|
|
1387
1394
|
logger && logger.warn(this.namespaceLog + ' slow connection to objects DB. Still waiting ...');
|
|
1388
1395
|
}
|
|
1389
|
-
},
|
|
1396
|
+
}, config.objects.connectTimeout * 2); // Because we do not connect only anymore, give it a bit more time
|
|
1390
1397
|
adapterObjects = new Objects({
|
|
1391
1398
|
namespace: this.namespaceLog,
|
|
1392
1399
|
connection: config.objects,
|
|
@@ -5115,7 +5122,7 @@ function Adapter(options) {
|
|
|
5115
5122
|
else {
|
|
5116
5123
|
logger && logger.warn(this.namespaceLog + ' slow connection to states DB. Still waiting ...');
|
|
5117
5124
|
}
|
|
5118
|
-
}, config.states.connectTimeout
|
|
5125
|
+
}, config.states.connectTimeout);
|
|
5119
5126
|
// Internal object, but some special adapters want to access it anyway.
|
|
5120
5127
|
adapterStates = new States({
|
|
5121
5128
|
namespace: this.namespaceLog,
|
|
@@ -7965,7 +7972,7 @@ function Adapter(options) {
|
|
|
7965
7972
|
initLogging(() => {
|
|
7966
7973
|
this.pluginHandler.setDatabaseForPlugins(adapterObjects, adapterStates);
|
|
7967
7974
|
this.pluginHandler.initPlugins(adapterConfig, async () => {
|
|
7968
|
-
if (!adapterStates) {
|
|
7975
|
+
if (!adapterStates || this.terminated) {
|
|
7969
7976
|
// if adapterState was destroyed,we should not continue
|
|
7970
7977
|
return;
|
|
7971
7978
|
}
|