summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Hoguin <essen@ninenines.eu>2016-09-21 09:03:52 +0200
committerLoïc Hoguin <essen@ninenines.eu>2016-09-21 09:03:52 +0200
commite7ae83f5cf81b103f3f1e46a64a1e0053dc4ba74 (patch)
tree664a26c2c2eaa050d8ec33b2f12867dd36689929
parent8259d901807320dc2dcd027ca2494e3c7eabfc27 (diff)
downloadrabbitmq-server-git-e7ae83f5cf81b103f3f1e46a64a1e0053dc4ba74.tar.gz
Remove remaining references to mochi/webmachine
-rw-r--r--src/rabbit_diagnostics.erl1
-rw-r--r--src/rabbit_vm.erl3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_diagnostics.erl b/src/rabbit_diagnostics.erl
index d28bb9ffd7..e5df1d5baf 100644
--- a/src/rabbit_diagnostics.erl
+++ b/src/rabbit_diagnostics.erl
@@ -64,7 +64,6 @@ maybe_stuck_stacktrace({prim_inet, accept0, _}) -> false;
maybe_stuck_stacktrace({prim_inet, recv0, _}) -> false;
maybe_stuck_stacktrace({rabbit_heartbeat, heartbeater, _}) -> false;
maybe_stuck_stacktrace({rabbit_net, recv, _}) -> false;
-maybe_stuck_stacktrace({mochiweb_http, request, _}) -> false;
maybe_stuck_stacktrace({group, _, _}) -> false;
maybe_stuck_stacktrace({shell, _, _}) -> false;
maybe_stuck_stacktrace({io, _, _}) -> false;
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl
index 5a6ffc1f5e..49293816e4 100644
--- a/src/rabbit_vm.erl
+++ b/src/rabbit_vm.erl
@@ -18,8 +18,7 @@
-export([memory/0, binary/0, ets_tables_memory/1]).
--define(MAGIC_PLUGINS, ["mochiweb", "webmachine", "cowboy", "sockjs",
- "rfc4627_jsonrpc"]).
+-define(MAGIC_PLUGINS, ["cowboy", "sockjs", "rfc4627_jsonrpc"]).
%%----------------------------------------------------------------------------