Skip to content

Commit

Permalink
LMDB_VALIDATION_TAG
Browse files Browse the repository at this point in the history
  • Loading branch information
chronolaw committed Nov 29, 2023
1 parent 7578869 commit c6013fc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
9 changes: 9 additions & 0 deletions kong/conf_loader/constants.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
local kong_meta = require "kong.meta"
local constants = require "kong.constants"


Expand Down Expand Up @@ -609,6 +610,12 @@ local _NOP_TOSTRING_MT = {
}


-- using kong version, "major.minor"
local LMDB_VALIDATION_TAG = string.format("%d.%d",
kong_meta._VERSION_TABLE.major,
kong_meta._VERSION_TABLE.minor)


return {
HEADERS = HEADERS,
BUNDLED_VAULTS = BUNDLED_VAULTS,
Expand All @@ -628,5 +635,7 @@ return {
TYP_CHECKS = TYP_CHECKS,

_NOP_TOSTRING_MT = _NOP_TOSTRING_MT,

LMDB_VALIDATION_TAG = LMDB_VALIDATION_TAG,
}

8 changes: 1 addition & 7 deletions kong/conf_loader/init.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
local require = require


local kong_meta = require "kong.meta"
local kong_default_conf = require "kong.templates.kong_defaults"
local process_secrets = require "kong.cmd.utils.process_secrets"
local nginx_signals = require "kong.cmd.utils.nginx_signals"
Expand Down Expand Up @@ -88,6 +87,7 @@ local TYP_CHECKS = conf_constants.TYP_CHECKS
local HEADERS = conf_constants.HEADERS
local BUNDLED_VAULTS = conf_constants.BUNDLED_VAULTS
local BUNDLED_PLUGINS = conf_constants.BUNDLED_PLUGINS
local LMDB_VALIDATION_TAG = = conf_constants.LMDB_VALIDATION_TAG


local _nop_tostring_mt = conf_constants._NOP_TOSTRING_MT
Expand All @@ -105,12 +105,6 @@ local function is_predefined_dhgroup(group)
end


-- using kong version, "major.minor"
local LMDB_VALIDATION_TAG = string.format("%d.%d",
kong_meta._VERSION_TABLE.major,
kong_meta._VERSION_TABLE.minor)


local function parse_value(value, typ)
if type(value) == "string" then
value = strip(value)
Expand Down

0 comments on commit c6013fc

Please sign in to comment.