diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | src/rabbit_disk_queue.erl | 16 |
2 files changed, 8 insertions, 19 deletions
@@ -1,7 +1,7 @@ RABBITMQ_NODENAME=rabbit RABBITMQ_SERVER_START_ARGS= -RABBITMQ_MNESIA_DIR=/tmp/rabbitmq-$(RABBITMQ_NODENAME)-mnesia -RABBITMQ_LOG_BASE=/tmp +RABBITMQ_MNESIA_DIR=~/tmp/rabbitmq-$(RABBITMQ_NODENAME)-mnesia +RABBITMQ_LOG_BASE=~/tmp SOURCE_DIR=src EBIN_DIR=ebin @@ -94,10 +94,11 @@ run-node: all run-tests: all echo "rabbit_tests:all_tests()." | $(ERL_CALL) -start-background-node: +start-background-node: stop-node $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ - ./scripts/rabbitmq-server -detached; sleep 1 + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ + ./scripts/rabbitmq-server ; sleep 1 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) @@ -129,7 +130,7 @@ srcdist: distclean cp README.in $(TARGET_SRC_DIR)/README elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \ >> $(TARGET_SRC_DIR)/BUILD - sed -i.save 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save + sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/ cp codegen.py Makefile generate_app $(TARGET_SRC_DIR) diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl index 2f8fd223df..e07206208d 100644 --- a/src/rabbit_disk_queue.erl +++ b/src/rabbit_disk_queue.erl @@ -44,7 +44,7 @@ dump_queue/1, delete_non_durable_queues/1, auto_ack_next_message/1 ]). --export([length/1, is_empty/1, next_write_seq/1]). +-export([length/1]). -export([stop/0, stop_and_obliterate/0, to_disk_only_mode/0, to_ram_disk_mode/0]). @@ -205,7 +205,7 @@ %% +-------+ +-------+ +-------+ %% | B | | X | | B | %% +-------+ +-------+ +-------+ -%% | A | | E | | A | +%% | A | | E | | A | %% +-------+ +-------+ +-------+ %% left right left %% @@ -264,8 +264,6 @@ -spec(to_ram_disk_mode/0 :: () -> 'ok'). -spec(to_disk_only_mode/0 :: () -> 'ok'). -spec(length/1 :: (queue_name()) -> non_neg_integer()). --spec(next_write_seq/1 :: (queue_name()) -> non_neg_integer()). --spec(is_empty/1 :: (queue_name()) -> bool()). -endif. @@ -347,12 +345,6 @@ to_ram_disk_mode() -> length(Q) -> gen_server2:call(?SERVER, {length, Q}, infinity). -next_write_seq(Q) -> - gen_server2:call(?SERVER, {next_write_seq, Q}, infinity). - -is_empty(Q) -> - 0 == rabbit_disk_queue:length(Q). - %% ---- GEN-SERVER INTERNAL API ---- init([FileSizeLimit, ReadFileHandlesLimit]) -> @@ -493,10 +485,6 @@ handle_call(to_ram_disk_mode, _From, handle_call({length, Q}, _From, State = #dqstate { sequences = Sequences }) -> {_ReadSeqId, _WriteSeqId, Length} = sequence_lookup(Sequences, Q), {reply, Length, State}; -handle_call({next_write_seq, Q}, _From, - State = #dqstate { sequences = Sequences }) -> - {_ReadSeqId, WriteSeqId, _Length} = sequence_lookup(Sequences, Q), - {reply, WriteSeqId, State}; handle_call({dump_queue, Q}, _From, State) -> {Result, State1} = internal_dump_queue(Q, State), {reply, Result, State1}; |