Skip to content

Override embedded config #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Override embedded config #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0723d4c
Override tarantool embedded config module
Gvg14u147 Feb 12, 2024
951f6b1
Fix dropping non-boxcfg options
Gvg14u147 Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ end

local function do_cfg(boxcfg, cfg)
for key, val in pairs(cfg) do
if load_cfg.default_cfg[key] == nil and load_cfg.dynamic_cfg[key] == nil then
if load_cfg.template_cfg[key] == nil then
local warn = string.format("Dropping non-boxcfg option '%s' given '%s'",key,val)
log.warn("%s",warn)
print(warn)
Expand Down
23 changes: 23 additions & 0 deletions rockspecs/config-scm-6.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package = 'config'
version = 'scm-6'
source = {
url = 'git+https://github.com/moonlibs/config.git',
branch = 'master',
}
description = {
summary = "Package for loading external lua config",
homepage = 'https://github.com/moonlibs/config.git',
license = 'BSD',
}
dependencies = {
'lua >= 5.1'
}
build = {
type = 'builtin',
modules = {
['override.config'] = 'config.lua';
['override.config.etcd'] = 'config/etcd.lua';
}
}

-- vim: syntax=lua