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

feat: add self node to /cluster

This commit is contained in:
Zhongwen Deng 2022-04-27 10:31:39 +08:00
parent 08cad804bf
commit 55be66a5eb
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -800,10 +800,10 @@ fields("log") ->
#{
mapping => "kernel.error_logger",
default => silent,
readOnly => true,
'readOnly' => true,
desc => ?DESC("log_error_logger")
})
}
}
)}
];
fields("console_handler") ->
log_handler_common_confs();
@ -812,8 +812,10 @@ fields("log_file_handler") ->
{"file",
sc(
file(),
#{desc => ?DESC("log_file_handler_file"),
validator => fun file_location/1 }
#{
desc => ?DESC("log_file_handler_file"),
validator => fun file_location/1
}
)},
{"rotation",
sc(
@ -1339,5 +1341,6 @@ file_location(File) ->
nomatch -> Error;
_ -> ok
end
catch _:_ -> Error
catch
_:_ -> Error
end.

6
apps/emqx_management/src/emqx_mgmt_api_cluster.erl
View File

@ -43,7 +43,8 @@ schema("/cluster") ->
responses => #{
200 => [
{name, ?HOCON(string(), #{desc => "Cluster name"})},
{nodes, ?HOCON(?ARRAY(string()), #{desc => "Node name"})}
{nodes, ?HOCON(?ARRAY(string()), #{desc => "Node name"})},
{self, ?HOCON(string(), #{desc => "Self node name"})}
]
}
}
@ -97,7 +98,8 @@ cluster_info(get, _) ->
ClusterName = application:get_env(ekka, cluster_name, emqxcl),
Info = #{
name => ClusterName,
nodes => mria_mnesia:running_nodes()
nodes => mria_mnesia:running_nodes(),
self => node()
},
{200, Info}.