Let reload_cluster not check some config values #1752
Conversation
src/ejabberd_config.erl
Outdated
| filter_out_gd_endpoints([Opt | Opts]) -> | ||
| [Opt | filter_out_gd_endpoints(Opts)]. | ||
|
|
||
| delete_path_in_proplist(Plist, [Step]) -> |
There was a problem hiding this comment.
@fenek, if you know of any function in stdlib that could replace this definition (that is a solution for a very generic problem of nested proplists), let me know - I haven't found one.
Codecov Report
@@ Coverage Diff @@
## master #1752 +/- ##
==========================================
- Coverage 74.47% 74.45% -0.03%
==========================================
Files 290 290
Lines 26931 26947 +16
==========================================
+ Hits 20058 20064 +6
- Misses 6873 6883 +10
Continue to review full report at Codecov.
|
|
Let's confirm that it works on dev machine, as there are no |
src/ejabberd_config.erl
Outdated
| % between nodes in cluster. Each option is expressed as | ||
| % a list of keys in proplist that should be deleted (if such | ||
| % path exists). The `root path` for them is a list of modules. | ||
| node_specific_module_options() -> |
There was a problem hiding this comment.
Hmm, can this path go into ejabberd.cfg itself?
I don't like it to be hardcoded.
It feels extremely installation-specific. For different clients we can have different per-node parameters.
I even think there would be installations with the same endpoints for all nodes.
There was a problem hiding this comment.
I'm not sure if it's not too meta. These hardcoded are the options that MIGHT be different and we don't require them to be the same (but they might be). It is not user's role to define them, I think.
There was a problem hiding this comment.
IMO can be done as a separate task. This PR solves immediate issue.
There was a problem hiding this comment.
@kanes115 I agree with @arcusfelis. It wouldn't be too meta and we already have config options only for advanced users, so why not affect the reload_cluster logic?
… into improve_reload_cluster_v2
kanes115
force-pushed
the
improve_reload_cluster_v2
branch
from
01ed5d4
to
017a5d9
Compare
src/ejabberd_config.erl
Outdated
|
|
||
| filter_out_node_specific_options([]) -> | ||
| []; | ||
| filter_out_node_specific_options([{local_config, {modules, Host}, Mods} | Opts]) -> % use record |
There was a problem hiding this comment.
Use record here in pattern matching
kanes115
force-pushed
the
improve_reload_cluster_v2
branch
from
56a00c2
to
ef91d82
Compare
kanes115
changed the title
It also refactors the creation of the node_specific_options list.
kanes115
force-pushed
the
improve_reload_cluster_v2
branch
from
161c9b8
to
95e017e
Compare
Right now we just filter this option out of config when calculating sha with
ejabberd_config:filter_out_node_specific_endpoints/1called incompute_config_file_version/1andcompute_config_version/1. In the future it should probably be more general (if the number of such different-among-nodes options increase).