Delete syslog deps in Makefile
This commit is contained in:
parent
0c39a7620e
commit
f954feffa5
4
Makefile
4
Makefile
|
@ -4,7 +4,7 @@ PROJECT = emqx
|
||||||
PROJECT_DESCRIPTION = EMQ X Broker
|
PROJECT_DESCRIPTION = EMQ X Broker
|
||||||
PROJECT_VERSION = 3.0
|
PROJECT_VERSION = 3.0
|
||||||
|
|
||||||
DEPS = jsx gproc gen_rpc lager ekka esockd cowboy clique lager_syslog
|
DEPS = jsx gproc gen_rpc lager ekka esockd cowboy clique emqx_passwd
|
||||||
|
|
||||||
dep_jsx = git https://github.com/talentdeficit/jsx 2.9.0
|
dep_jsx = git https://github.com/talentdeficit/jsx 2.9.0
|
||||||
dep_gproc = git https://github.com/uwiger/gproc 0.8.0
|
dep_gproc = git https://github.com/uwiger/gproc 0.8.0
|
||||||
|
@ -14,7 +14,7 @@ dep_esockd = git https://github.com/emqx/esockd v5.4
|
||||||
dep_ekka = git https://github.com/emqx/ekka v0.4.1
|
dep_ekka = git https://github.com/emqx/ekka v0.4.1
|
||||||
dep_cowboy = git https://github.com/ninenines/cowboy 2.4.0
|
dep_cowboy = git https://github.com/ninenines/cowboy 2.4.0
|
||||||
dep_clique = git https://github.com/emqx/clique develop
|
dep_clique = git https://github.com/emqx/clique develop
|
||||||
dep_lager_syslog = git https://github.com/basho/lager_syslog 3.0.1
|
dep_emqx_passwd = git https://github.com/emqx/emqx-passwd win30
|
||||||
|
|
||||||
NO_AUTOPATCH = cuttlefish
|
NO_AUTOPATCH = cuttlefish
|
||||||
|
|
||||||
|
|
|
@ -404,16 +404,6 @@ log.crash = on
|
||||||
## Value: File Name
|
## Value: File Name
|
||||||
log.crash.file = {{ platform_log_dir }}/crash.log
|
log.crash.file = {{ platform_log_dir }}/crash.log
|
||||||
|
|
||||||
## Enable syslog.
|
|
||||||
##
|
|
||||||
## Values: on | off
|
|
||||||
log.syslog = on
|
|
||||||
|
|
||||||
## Sets the severity level for syslog.
|
|
||||||
##
|
|
||||||
## Value: debug | info | notice | warning | error | critical | alert | emergency
|
|
||||||
log.syslog.level = error
|
|
||||||
|
|
||||||
##--------------------------------------------------------------------
|
##--------------------------------------------------------------------
|
||||||
## Authentication/Access Control
|
## Authentication/Access Control
|
||||||
##--------------------------------------------------------------------
|
##--------------------------------------------------------------------
|
||||||
|
|
|
@ -441,26 +441,6 @@ end}.
|
||||||
{datatype, integer}
|
{datatype, integer}
|
||||||
]}.
|
]}.
|
||||||
|
|
||||||
{mapping, "log.syslog", "lager.handlers", [
|
|
||||||
{default, off},
|
|
||||||
{datatype, flag}
|
|
||||||
]}.
|
|
||||||
|
|
||||||
{mapping, "log.syslog.identity", "lager.handlers", [
|
|
||||||
{default, "emqx"},
|
|
||||||
{datatype, string}
|
|
||||||
]}.
|
|
||||||
|
|
||||||
{mapping, "log.syslog.facility", "lager.handlers", [
|
|
||||||
{default, local0},
|
|
||||||
{datatype, {enum, [daemon, local0, local1, local2, local3, local4, local5, local6, local7]}}
|
|
||||||
]}.
|
|
||||||
|
|
||||||
{mapping, "log.syslog.level", "lager.handlers", [
|
|
||||||
{default, error},
|
|
||||||
{datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency]}}
|
|
||||||
]}.
|
|
||||||
|
|
||||||
{mapping, "log.error.redirect", "lager.error_logger_redirect", [
|
{mapping, "log.error.redirect", "lager.error_logger_redirect", [
|
||||||
{default, on},
|
{default, on},
|
||||||
{datatype, flag},
|
{datatype, flag},
|
||||||
|
@ -511,14 +491,7 @@ end}.
|
||||||
both -> [ConsoleHandler, ConsoleFileHandler];
|
both -> [ConsoleHandler, ConsoleFileHandler];
|
||||||
_ -> []
|
_ -> []
|
||||||
end,
|
end,
|
||||||
SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf) of
|
ConsoleHandlers ++ ErrorHandler ++ InfoHandler
|
||||||
false -> [];
|
|
||||||
true -> [{lager_syslog_backend,
|
|
||||||
[cuttlefish:conf_get("log.syslog.identity", Conf),
|
|
||||||
cuttlefish:conf_get("log.syslog.facility", Conf),
|
|
||||||
cuttlefish:conf_get("log.syslog.level", Conf)]}]
|
|
||||||
end,
|
|
||||||
ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler
|
|
||||||
end
|
end
|
||||||
}.
|
}.
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
{modules,[]},
|
{modules,[]},
|
||||||
{registered,[emqx_sup]},
|
{registered,[emqx_sup]},
|
||||||
{applications,[kernel,stdlib,jsx,gproc,gen_rpc,lager,esockd,
|
{applications,[kernel,stdlib,jsx,gproc,gen_rpc,lager,esockd,
|
||||||
cowboy,lager_syslog]},
|
cowboy]},
|
||||||
{env,[]},
|
{env,[]},
|
||||||
{mod,{emqx_app,[]}},
|
{mod,{emqx_app,[]}},
|
||||||
{maintainers,["Feng Lee <feng@emqx.io>"]},
|
{maintainers,["Feng Lee <feng@emqx.io>"]},
|
||||||
|
|
Loading…
Reference in New Issue