Skip to content

Commit 4c5feb9

Browse files
committed
(bluefox) v0.7.1
1 parent aac0c32 commit 4c5feb9

File tree

5 files changed

+56
-6
lines changed

5 files changed

+56
-6
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# 0.7.1 (2015-06-28)
2+
* (bluefox) support of permissions
3+
* (bluefox) fix backup
4+
* (bluefox) fix error with noFileCache
5+
* (bluefox) add unsubscribeForeignObjects to adapters
6+
* (bluefox) add icon sets to repository
7+
* (bluefox) implement list: objets, states, instances, adapters
8+
* (bluefox) support of "list hosts"
9+
* (bluefox) verify version by install and start
10+
* (bluefox) fix error with dependencies
11+
* (bluefox) fix delete of logs
12+
* (bluefox) fix getPort function in adapter.
13+
14+
115
# 0.7.0 (2015-05-07)
216
* (bluefox) support of permissions
317

controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ function startInstance(id, wakeUp) {
10211021
fileNameFull = adapterDir + '/' + fileName;
10221022
if (instance.common.onlyWWW || !fs.existsSync(fileNameFull)) {
10231023
// If not just www files
1024-
if (fs.existsSync(adapterDir + '/www')) {
1024+
if (instance.common.onlyWWW || fs.existsSync(adapterDir + '/www')) {
10251025
logger.debug('host.' + hostname + ' startInstance ' + name + '.' + args[0] + ' only WWW files. Nothing to start');
10261026
} else {
10271027
logger.error('host.' + hostname + ' startInstance ' + name + '.' + args[0] + ': cannot find start file!');

io-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"common": {
33
"name": "js-controller",
4-
"version": "0.7.0",
4+
"version": "0.7.1",
55
"platform": "Javascript/Node.js",
66
"controller": true,
77
"title": "ioBroker.js-controller",

lib/setup.js

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2816,18 +2816,54 @@ function createInstance(adapter, options, callback) {
28162816
}
28172817
}
28182818

2819+
// If some other adapters must be restarted
2820+
var isRestarting = false;
28192821
if (adapterConf.common.restartAdapters) {
28202822
if (typeof adapterConf.common.restartAdapters !== 'object') adapterConf.common.restartAdapters = [adapterConf.common.restartAdapters];
28212823
for (var r = 0; r < adapterConf.common.restartAdapters.length; r++) {
28222824
if (adapterConf.common.restartAdapters[r].indexOf('.') == -1) {
28232825
// TODO: find all adapters
28242826
adapterConf.common.restartAdapters[r] = adapterConf.common.restartAdapters[r] + '.0';
28252827
}
2826-
2828+
isRestarting = true;
2829+
2830+
objects.getObject('system.adapter.' + adapterConf.common.restartAdapters[r], function (err, obj) {
2831+
if (!err && obj && obj.common.enabled) {
2832+
2833+
obj.common.enabled = false;
2834+
2835+
objects.setObject(obj._id, obj, function (err) {
2836+
if (!err) {
2837+
2838+
obj.common.enabled = true;
2839+
2840+
objects.setObject(obj._id, obj, function (err) {
2841+
console.log('Adapter "' + obj._id + ' restarted.');
2842+
setObjs();
2843+
});
2844+
} else {
2845+
if (err) {
2846+
console.error('Cannot restart adapter "' + obj._id + ': ' + err);
2847+
} else {
2848+
console.warn('Adapter "' + obj._id + ' is disabled and cannot be restarted.');
2849+
}
2850+
setObjs();
2851+
}
2852+
});
2853+
} else {
2854+
if (err) {
2855+
console.error('Cannot restart adapter "' + obj._id + ': ' + err);
2856+
} else {
2857+
console.warn('Adapter "' + obj._id + ' is disabled and cannot be restarted.');
2858+
}
2859+
setObjs();
2860+
}
2861+
});
28272862
}
28282863
}
2829-
2830-
setObjs();
2864+
if (!isRestarting) {
2865+
setObjs();
2866+
}
28312867
});
28322868
});
28332869
});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "iobroker.js-controller",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"engines": {
55
"node": ">=0.8"
66
},

0 commit comments

Comments
 (0)