From f954feffa58e3132cac77607da79c3ab5f471243 Mon Sep 17 00:00:00 2001
From: HuangDan <huangd@emqtt.io>
Date: Wed, 12 Sep 2018 14:26:20 +0800
Subject: [PATCH] Delete syslog deps in Makefile

---
 Makefile         |  4 ++--
 etc/emqx.conf    | 10 ----------
 priv/emqx.schema | 29 +----------------------------
 src/emqx.app.src |  2 +-
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index 2417ad040..07c097610 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PROJECT = emqx
 PROJECT_DESCRIPTION = EMQ X Broker
 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_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_cowboy  = git https://github.com/ninenines/cowboy 2.4.0
 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
 
diff --git a/etc/emqx.conf b/etc/emqx.conf
index deb702211..87665c194 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -404,16 +404,6 @@ log.crash = on
 ## Value: File Name
 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
 ##--------------------------------------------------------------------
diff --git a/priv/emqx.schema b/priv/emqx.schema
index e9f4932c4..4d2c4c3bd 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -441,26 +441,6 @@ end}.
   {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", [
   {default, on},
   {datatype, flag},
@@ -511,14 +491,7 @@ end}.
       both -> [ConsoleHandler, ConsoleFileHandler];
       _ -> []
     end,
-    SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf) of
-      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
+    ConsoleHandlers ++ ErrorHandler ++ InfoHandler
   end
 }.
 
diff --git a/src/emqx.app.src b/src/emqx.app.src
index d44707186..18ee93a30 100644
--- a/src/emqx.app.src
+++ b/src/emqx.app.src
@@ -4,7 +4,7 @@
               {modules,[]},
               {registered,[emqx_sup]},
               {applications,[kernel,stdlib,jsx,gproc,gen_rpc,lager,esockd,
-                             cowboy,lager_syslog]},
+                             cowboy]},
               {env,[]},
               {mod,{emqx_app,[]}},
               {maintainers,["Feng Lee <feng@emqx.io>"]},