summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-12-17 11:00:45 +0000
committerMatthias Radestock <matthias@lshift.net>2008-12-17 11:00:45 +0000
commit8bbce648741e57b672f1070ce530484e0102ae94 (patch)
tree6149277fa34b25289ff83ba677ecff6edbe6ffc6
parentb9ba02dc410a2605e9e499f0cf6d50d93b8a893e (diff)
downloadrabbitmq-server-8bbce648741e57b672f1070ce530484e0102ae94.tar.gz
remove rabbitmq-mnesia-current
the integrity check is now done on startup
-rw-r--r--Makefile4
-rwxr-xr-xscripts/rabbitmq-mnesia-current57
2 files changed, 0 insertions, 61 deletions
diff --git a/Makefile b/Makefile
index 75e1de7b..8b37ad72 100644
--- a/Makefile
+++ b/Makefile
@@ -76,10 +76,6 @@ run: all
RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -s rabbit" \
./scripts/rabbitmq-server
-check-mnesia-schema: all
- $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
- ./scripts/rabbitmq-mnesia-current
-
run-node: all
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
diff --git a/scripts/rabbitmq-mnesia-current b/scripts/rabbitmq-mnesia-current
deleted file mode 100755
index 081066da..00000000
--- a/scripts/rabbitmq-mnesia-current
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License at
-## http://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-## License for the specific language governing rights and limitations
-## under the License.
-##
-## The Original Code is RabbitMQ.
-##
-## The Initial Developers of the Original Code are LShift Ltd,
-## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-##
-## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-## Technologies LLC, and Rabbit Technologies Ltd.
-##
-## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
-## Ltd. Portions created by Cohesive Financial Technologies LLC are
-## Copyright (C) 2007-2009 Cohesive Financial Technologies
-## LLC. Portions created by Rabbit Technologies Ltd are Copyright
-## (C) 2007-2009 Rabbit Technologies Ltd.
-##
-## All Rights Reserved.
-##
-## Contributor(s): ______________________________________.
-##
-
-[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
-
-[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
-[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
-[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
-[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
-[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
-[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia
-[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
-[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}
-
-if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then
- RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\""
-else
- RABBITMQ_CLUSTER_CONFIG_OPTION=""
-fi
-
-exec erl \
- -pa "`dirname $0`/../ebin" \
- -noshell \
- -sname ${RABBITMQ_NODENAME} \
- -eval 'halt(case rabbit_mnesia:schema_current() of true -> 0; false -> 1 end).' \
- -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
- -kernel error_logger '{file,"'/dev/null'"}' \
- ${RABBITMQ_CLUSTER_CONFIG_OPTION}