diff options
| -rw-r--r-- | erlang.mk | 102 | ||||
| -rw-r--r-- | guide/listeners.md | 2 | ||||
| -rw-r--r-- | src/ranch.app.src | 2 | ||||
| -rw-r--r-- | src/ranch_conns_sup.erl | 16 |
4 files changed, 105 insertions, 17 deletions
@@ -12,6 +12,21 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Project. + +PROJECT ?= $(notdir $(CURDIR)) + +# Packages database file. + +PKG_FILE ?= $(CURDIR)/.erlang.mk.packages.v1 +export PKG_FILE + +PKG_FILE_URL ?= https://raw.github.com/extend/erlang.mk/master/packages.v1.tsv + +define get_pkg_file + wget -O $(PKG_FILE) $(PKG_FILE_URL) +endef + # Verbosity and tweaks. V ?= 0 @@ -19,9 +34,12 @@ V ?= 0 appsrc_verbose_0 = @echo " APP " $(PROJECT).app.src; appsrc_verbose = $(appsrc_verbose_$(V)) -erlc_verbose_0 = @echo " ERLC " $(filter-out %.dtl,$(?F)); +erlc_verbose_0 = @echo " ERLC " $(filter %.erl %.core,$(?F)); erlc_verbose = $(erlc_verbose_$(V)) +xyrl_verbose_0 = @echo " XYRL " $(filter %.xrl %.yrl,$(?F)); +xyrl_verbose = $(xyrl_verbose_$(V)) + dtl_verbose_0 = @echo " DTL " $(filter %.dtl,$(?F)); dtl_verbose = $(dtl_verbose_$(V)) @@ -36,11 +54,17 @@ gen_verbose = $(gen_verbose_$(V)) DEPS_DIR ?= $(CURDIR)/deps export DEPS_DIR +REBAR_DEPS_DIR = $(DEPS_DIR) +export REBAR_DEPS_DIR + ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(DEPS)) ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS)) # Application. +ERL_LIBS ?= $(DEPS_DIR) +export ERL_LIBS + ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \ +warn_shadow_vars +warn_obsolete_guard # +bin_opt_info +warn_missing_spec COMPILE_FIRST ?= @@ -52,19 +76,25 @@ clean-all: clean clean-deps clean-docs $(gen_verbose) rm -rf .$(PROJECT).plt $(DEPS_DIR) logs app: ebin/$(PROJECT).app - $(eval MODULES := $(shell find ebin -name \*.beam \ + $(eval MODULES := $(shell find ebin -type f -name \*.beam \ | sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//')) $(appsrc_verbose) cat src/$(PROJECT).app.src \ | sed 's/{modules, \[\]}/{modules, \[$(MODULES)\]}/' \ > ebin/$(PROJECT).app define compile_erl - $(erlc_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \ - $(COMPILE_FIRST_PATHS) $(1) + $(erlc_verbose) erlc -v $(ERLC_OPTS) -o ebin/ \ + -pa ebin/ -I include/ $(COMPILE_FIRST_PATHS) $(1) +endef + +define compile_xyrl + $(xyrl_verbose) erlc -v -o ebin/ $(1) + $(xyrl_verbose) erlc $(ERLC_OPTS) -o ebin/ ebin/*.erl + @rm ebin/*.erl endef define compile_dtl - $(dtl_verbose) erl -noshell -pa ebin/ deps/erlydtl/ebin/ -eval ' \ + $(dtl_verbose) erl -noshell -pa ebin/ $(DEPS_DIR)/erlydtl/ebin/ -eval ' \ Compile = fun(F) -> \ Module = list_to_atom( \ string:to_lower(filename:basename(F, ".dtl")) ++ "_dtl"), \ @@ -74,10 +104,16 @@ define compile_dtl init:stop()' endef -ebin/$(PROJECT).app: src/*.erl $(wildcard src/*.core) $(wildcard templates/*.dtl) +ebin/$(PROJECT).app: $(shell find src -type f -name \*.erl) \ + $(shell find src -type f -name \*.core) \ + $(shell find src -type f -name \*.xrl) \ + $(shell find src -type f -name \*.yrl) \ + $(shell find templates -type f -name \*.dtl 2>/dev/null) @mkdir -p ebin/ - $(if $(strip $(filter-out %.dtl,$?)), \ - $(call compile_erl,$(filter-out %.dtl,$?))) + $(if $(strip $(filter %.erl %.core,$?)), \ + $(call compile_erl,$(filter %.erl %.core,$?))) + $(if $(strip $(filter %.xrl %.yrl,$?)), \ + $(call compile_xyrl,$(filter %.xrl %.yrl,$?))) $(if $(strip $(filter %.dtl,$?)), \ $(call compile_dtl,$(filter %.dtl,$?))) @@ -88,7 +124,14 @@ clean: define get_dep @mkdir -p $(DEPS_DIR) +ifeq (,$(findstring pkg://,$(word 1,$(dep_$(1))))) git clone -n -- $(word 1,$(dep_$(1))) $(DEPS_DIR)/$(1) +else + @if [ ! -f $(PKG_FILE) ]; then $(call get_pkg_file); fi + git clone -n -- `awk 'BEGIN { FS = "\t" }; \ + $$$$1 == "$(subst pkg://,,$(word 1,$(dep_$(1))))" { print $$$$2 }' \ + $(PKG_FILE)` $(DEPS_DIR)/$(1) +endif cd $(DEPS_DIR)/$(1) ; git checkout -q $(word 2,$(dep_$(1))) endef @@ -100,7 +143,13 @@ endef $(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep)))) deps: $(ALL_DEPS_DIRS) - @for dep in $(ALL_DEPS_DIRS) ; do $(MAKE) -C $$dep; done + @for dep in $(ALL_DEPS_DIRS) ; do \ + if [ -f $$dep/Makefile ] ; then \ + $(MAKE) -C $$dep ; \ + else \ + echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \ + fi ; \ + done clean-deps: @for dep in $(ALL_DEPS_DIRS) ; do $(MAKE) -C $$dep clean; done @@ -122,13 +171,13 @@ build-test-deps: $(ALL_TEST_DEPS_DIRS) @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done build-tests: build-test-deps - $(gen_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o test/ \ + $(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \ $(wildcard test/*.erl test/*/*.erl) -pa ebin/ CT_RUN = ct_run \ -no_auto_compile \ -noshell \ - -pa ebin $(DEPS_DIR)/*/ebin \ + -pa $(realpath ebin) $(DEPS_DIR)/*/ebin \ -dir test \ -logdir logs # -cover test/cover.spec @@ -138,8 +187,11 @@ CT_SUITES_FULL = $(addsuffix _SUITE,$(CT_SUITES)) tests: ERLC_OPTS += -DTEST=1 +'{parse_transform, eunit_autoexport}' tests: clean deps app build-tests - @mkdir -p logs/ - @$(CT_RUN) -suite $(CT_SUITES_FULL) + @if [ -d "test" ] ; \ + then \ + mkdir -p logs/ ; \ + $(CT_RUN) -suite $(CT_SUITES_FULL) ; \ + fi $(gen_verbose) rm -f test/*.beam # Dialyzer. @@ -154,3 +206,27 @@ build-plt: deps app dialyze: @dialyzer --src src --plt .$(PROJECT).plt --no_native $(DIALYZER_OPTS) + +# Packages. + +$(PKG_FILE): + @$(call get_pkg_file) + +pkg-list: $(PKG_FILE) + @cat $(PKG_FILE) | awk 'BEGIN { FS = "\t" }; { print \ + "Name:\t\t" $$1 "\n" \ + "Repository:\t" $$2 "\n" \ + "Website:\t" $$3 "\n" \ + "Description:\t" $$4 "\n" }' + +ifdef q +pkg-search: $(PKG_FILE) + @cat $(PKG_FILE) | grep -i ${q} | awk 'BEGIN { FS = "\t" }; { print \ + "Name:\t\t" $$1 "\n" \ + "Repository:\t" $$2 "\n" \ + "Website:\t" $$3 "\n" \ + "Description:\t" $$4 "\n" }' +else +pkg-search: + @echo "Usage: make pkg-search q=STRING" +endif diff --git a/guide/listeners.md b/guide/listeners.md index 3ddc0ae..a941c22 100644 --- a/guide/listeners.md +++ b/guide/listeners.md @@ -55,7 +55,7 @@ You can try this out by compiling and running the `tcp_echo` example in the examples directory. To do so, open a shell in the `examples/tcp_echo/` directory and run the following commands: -``` +``` bash % rebar get-deps compile % ./start.sh Listening on port 5555 diff --git a/src/ranch.app.src b/src/ranch.app.src index cf80068..03b8dae 100644 --- a/src/ranch.app.src +++ b/src/ranch.app.src @@ -14,7 +14,7 @@ {application, ranch, [ {description, "Socket acceptor pool for TCP protocols."}, - {vsn, "0.8.4"}, + {vsn, "0.8.5"}, {modules, []}, {registered, [ranch_sup, ranch_server]}, {applications, [ diff --git a/src/ranch_conns_sup.erl b/src/ranch_conns_sup.erl index 54d6758..ab79ef1 100644 --- a/src/ranch_conns_sup.erl +++ b/src/ranch_conns_sup.erl @@ -147,11 +147,13 @@ loop(State=#state{parent=Parent, ref=Ref, conn_type=ConnType, CurConns, NbChildren, Sleepers); {'EXIT', Parent, Reason} -> exit(Reason); - {'EXIT', Pid, _} when Sleepers =:= [] -> + {'EXIT', Pid, Reason} when Sleepers =:= [] -> + report_error(Ref, Pid, Reason), erase(Pid), loop(State, CurConns - 1, NbChildren - 1, Sleepers); %% Resume a sleeping acceptor if needed. - {'EXIT', Pid, _} -> + {'EXIT', Pid, Reason} -> + report_error(Ref, Pid, Reason), erase(Pid), [To|Sleepers2] = Sleepers, To ! self(), @@ -188,3 +190,13 @@ system_terminate(Reason, _, _, _) -> system_code_change(Misc, _, _, _) -> {ok, Misc}. + +%% We use ~999999p here instead of ~w because the latter doesn't +%% support printable strings. +report_error(_, _, normal) -> + ok; +report_error(Ref, Pid, Reason) -> + error_logger:error_msg( + "Ranch listener ~p had connection process ~p " + "exit with reason: ~999999p~n", + [Ref, Pid, Reason]). |