Add libconfig import support to remaining conf files#3409
Open
MrKeiKun wants to merge 2 commits intoHerculesWS:masterfrom
Open
Add libconfig import support to remaining conf files#3409MrKeiKun wants to merge 2 commits intoHerculesWS:masterfrom
MrKeiKun wants to merge 2 commits intoHerculesWS:masterfrom
Conversation
62cf4ca to
3505112
Compare
d26954e to
d4106c9
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Prelude
Changes Proposed
Adds the
import:override mechanism to conf files that were missing it, consistent with the existing pattern used inmap-server.conf,char-server.conf, etc.conf/atcommand.conf— added import lookup inatcommand_config_read()conf/groups.conf— refactoredread_config()inpc_groups.cto use a static config pool so all configs stay alive until inheritance resolution andatcommand->load_groups()completeconf/channels.conf— splitread_channels_config()into a_from_file()helper with recursive import supportconf/battlegrounds.conf— same wrapper/helper split patternconf/clans.conf— import recurses withreload=falseto avoid clearing the DB on the secondary fileconf/network.confandconf/api/api_network.conf— added import lookup insocket_net_config_read()(already accepted a filename)conf/plugins.conf— replaced the oldfopenreplace-hack with proper merge support; HPMHooking-first ordering preserved via anis_primaryflagEach modified conf file gets an
import:line pointing toconf/import/<name>.conf, and a corresponding skeleton is added toconf/import-tmpl/.Issues addressed: #62