yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ds): don't use env var for data dir default value 

Fixes https://github.com/emqx/emqx/pull/12380
This commit is contained in:
Thales Macedo Garitezi 2024-01-24 11:39:14 -03:00
parent 83c8d80f3a
commit 5547a40ceb
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/src/emqx_persistent_message.erl
View File

@ -61,13 +61,13 @@ force_ds() ->
emqx_config:get([session_persistence, force_persistence]). emqx_config:get([session_persistence, force_persistence]).
storage_backend(#{ storage_backend(#{
builtin := #{ builtin := Opts = #{
enable := true, enable := true,
data_dir := DataDir,
n_shards := NShards, n_shards := NShards,
replication_factor := ReplicationFactor replication_factor := ReplicationFactor
} }
}) -> }) ->
DataDir = maps:get(data_dir, Opts, emqx:data_dir()),
#{ #{
backend => builtin, backend => builtin,
data_dir => DataDir, data_dir => DataDir,

7
apps/emqx/src/emqx_schema.erl
View File

@ -1896,11 +1896,8 @@ fields("session_storage_backend_builtin") ->
string(), string(),
#{ #{
desc => ?DESC(session_builtin_data_dir), desc => ?DESC(session_builtin_data_dir),
default => <<"${EMQX_DATA_DIR}">>, required => false,
importance => ?IMPORTANCE_LOW, importance => ?IMPORTANCE_LOW
converter => fun(Path, Opts) ->
naive_env_interpolation(ensure_unicode_path(Path, Opts))
end
} }
)}, )},
{"n_shards", {"n_shards",