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

rename emqttd.conf -> emq.conf

This commit is contained in:
Feng Lee 2016-10-12 19:30:34 +08:00
parent 3cfac3430a
commit e26ed33f7f
3 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,4 +38,4 @@ include erlang.mk
app:: rebar.config app:: rebar.config
app.config:: app.config::
cuttlefish -l info -e etc/ -c etc/emqttd.conf -i priv/emqttd.schema -d data/ cuttlefish -l info -e etc/ -c etc/emq.conf -i priv/emq.schema -d data/

16
etc/emqttd.conf → etc/emq.conf
View File

@ -43,7 +43,7 @@ node.max_ets_tables = 256000
node.fullsweep_after = 1000 node.fullsweep_after = 1000
## Crash dump ## Crash dump
node.crash_dump = $(platform_log_dir)/crash.dump node.crash_dump = log/crash.dump
##-------------------------------------------------------------------- ##--------------------------------------------------------------------
## Log ## Log
@ -56,15 +56,15 @@ log.console = console
log.console.level = error log.console.level = error
## Console log file ## Console log file
## log.console.file = $(platform_log_dir)/console.log ## log.console.file = log/console.log
## Error log file ## Error log file
log.error.file = $(platform_log_dir)/error.log log.error.file = log/error.log
## Enable the crash log. Enum: on, off ## Enable the crash log. Enum: on, off
log.crash = on log.crash = on
log.crash.file = $(platform_log_dir)/crash.log log.crash.file = log/crash.log
##-------------------------------------------------------------------- ##--------------------------------------------------------------------
## MQTT Protocol ## MQTT Protocol
@ -204,10 +204,10 @@ mqtt.bridge.ping_down_interval = 1 ## Second
##------------------------------------------------------------------- ##-------------------------------------------------------------------
## Dir of plugins' config ## Dir of plugins' config
mqtt.plugins.etc_dir = $(platform_etc_dir)/plugins/ mqtt.plugins.etc_dir = etc/plugins/
## File to store loaded plugin names. ## File to store loaded plugin names.
mqtt.plugins.loaded_file = $(platform_data_dir)/loaded_plugins mqtt.plugins.loaded_file = data/loaded_plugins
##------------------------------------------------------------------- ##-------------------------------------------------------------------
## MQTT Modules ## MQTT Modules
@ -259,7 +259,3 @@ sysmon.busy_port = false
## Busy Dist Port ## Busy Dist Port
sysmon.busy_dist_port = true sysmon.busy_dist_port = true
platform_etc_dir = ./etc
platform_log_dir = ./log

21
priv/emqttd.schema → priv/emq.schema
View File

@ -132,12 +132,12 @@
]}. ]}.
{mapping, "log.console.file", "lager.handlers", [ {mapping, "log.console.file", "lager.handlers", [
{default, "$(platform_log_dir)/console.log"}, {default, "log/console.log"},
{datatype, file} {datatype, file}
]}. ]}.
{mapping, "log.error.file", "lager.handlers", [ {mapping, "log.error.file", "lager.handlers", [
{default, "$(platform_log_dir)/error.log"}, {default, "log/error.log"},
{datatype, file} {datatype, file}
]}. ]}.
@ -192,7 +192,7 @@
]}. ]}.
{mapping, "log.crash.file", "lager.crash_log", [ {mapping, "log.crash.file", "lager.crash_log", [
{default, "$(platform_log_dir)/crash.log"}, {default, "log/crash.log"},
{datatype, file} {datatype, file}
]}. ]}.
@ -539,18 +539,3 @@ end}.
{busy_dist_port, cuttlefish:conf_get("sysmon.busy_dist_port", Conf)}] {busy_dist_port, cuttlefish:conf_get("sysmon.busy_dist_port", Conf)}]
end}. end}.
{mapping, "platform_etc_dir", "emqttd.platform_etc_dir", [
{datatype, directory},
{default, "./etc"}
]}.
{mapping, "platform_log_dir", "emqttd.platform_log_dir", [
{datatype, directory},
{default, "./log"}
]}.
{mapping, "platform_data_dir", "emqttd.platform_data_dir", [
{datatype, directory},
{default, "./data"}
]}.