Commit a313b6c5 authored by Roque's avatar Roque

[WIP] erp5_web_monitoring: force re-config mec

parent 27a6dce4
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
.declareAcquiredMethod("setSettingList", "setSettingList") .declareAcquiredMethod("setSettingList", "setSettingList")
.declareAcquiredMethod("setSetting", "setSetting") .declareAcquiredMethod("setSetting", "setSetting")
.declareMethod('updateConfiguration', function (appcache_storage, current_version, jio_storage) { .declareMethod('updateConfiguration', function (appcache_storage, current_version, jio_storage, force_config) {
var gadget = this; var gadget = this, setting_dict = {'migration_version': current_version};
if (!appcache_storage) { return; } if (!appcache_storage) { return; }
return RSVP.Queue() return RSVP.Queue()
.push(function () { .push(function () {
...@@ -131,9 +131,11 @@ ...@@ -131,9 +131,11 @@
return jio_storage.repair(); return jio_storage.repair();
}) })
.push(function () { .push(function () {
return gadget.setSettingList({'migration_version': current_version, if (force_config) {
'master_url_list': undefined, setting_dict.master_url_list = undefined;
'master_url_list_updated': false}); setting_dict.master_url_list_updated = false;
}
return gadget.setSettingList(setting_dict);
}); });
}) })
...@@ -237,7 +239,9 @@ ...@@ -237,7 +239,9 @@
.push(function () { .push(function () {
if (migration_version !== current_version) { if (migration_version !== current_version) {
appcache_storage = jIO.createJIO(appcache_jio); appcache_storage = jIO.createJIO(appcache_jio);
return gadget.updateConfiguration(appcache_storage, current_version, gadget.props.jio_storage); //TODO make it true only if old config is present (e.g. 'promise' portal_type objects (instead of new 'Promise')
var force_config = true;
return gadget.updateConfiguration(appcache_storage, current_version, gadget.props.jio_storage, force_config);
} }
}) })
.push(function () { .push(function () {
......
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1019.25813.42370.5614</string> </value> <value> <string>1019.60308.13005.3276</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1726682335.1</float> <float>1728665702.96</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment