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

fix windows branch conflicts

This commit is contained in:
turtled 2017-03-31 14:44:13 +08:00
parent 8bc0ba9a7b 71eaf285f7
commit d8d96c1c6e
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -4,7 +4,6 @@ PROJECT_VERSION = 2.1.0
DEPS = goldrush gproc lager esockd mochiweb pbkdf2 lager_syslog DEPS = goldrush gproc lager esockd mochiweb pbkdf2 lager_syslog
dep_goldrush = git https://github.com/basho/goldrush 0.1.9 dep_goldrush = git https://github.com/basho/goldrush 0.1.9
dep_gproc = git https://github.com/uwiger/gproc dep_gproc = git https://github.com/uwiger/gproc
dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_getopt = git https://github.com/jcomellas/getopt v0.8.2
@ -14,6 +13,7 @@ dep_mochiweb = git https://github.com/emqtt/mochiweb
dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1 dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1
dep_lager_syslog = git https://github.com/basho/lager_syslog dep_lager_syslog = git https://github.com/basho/lager_syslog
ERLC_OPTS += +'{parse_transform, lager_transform}' ERLC_OPTS += +'{parse_transform, lager_transform}'
NO_AUTOPATCH = cuttlefish NO_AUTOPATCH = cuttlefish

6
etc/emq.conf
View File

@ -63,12 +63,6 @@ log.dir = {{ platform_log_dir }}
## Console log. Enum: off, file, console, both ## Console log. Enum: off, file, console, both
log.console = console log.console = console
## Syslog. Enum: on, off
log.syslog = on
## syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency
log.syslog.level = error
## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency ## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency
log.console.level = error log.console.level = error