diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-03 14:54:23 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-03 14:54:23 +0000 |
| commit | d4ec127d7aa0a8d6514599006db550de96fbdf09 (patch) | |
| tree | c07348d3a66d639654477fc5318651587368d8c2 | |
| parent | 731019a2b1c2375104239648bb3334a9ea200342 (diff) | |
| download | rabbitmq-server-git-d4ec127d7aa0a8d6514599006db550de96fbdf09.tar.gz | |
Generated config usage in windows scripts
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 8 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 12 | ||||
| -rw-r--r-- | src/rabbit.erl | 2 |
4 files changed, 15 insertions, 15 deletions
@@ -370,7 +370,7 @@ install-erlapp: dist @# rabbitmq_server/include. $(verbose) cp -r $(DEPS_DIR)/rabbit_common/include $(DESTDIR)$(RMQ_ERLAPP_DIR) -install-scripts: schema +install-scripts: build-schema $(verbose) mkdir -p $(DESTDIR)$(RMQ_ERLAPP_DIR)/sbin $(inst_verbose) for script in $(SCRIPTS); do \ cp "scripts/$$script" "$(DESTDIR)$(RMQ_ERLAPP_DIR)/sbin"; \ @@ -412,12 +412,12 @@ install-windows-erlapp: dist # rabbitmq_server/include. $(verbose) cp -r $(DEPS_DIR)/rabbit_common/include $(DESTDIR)$(WINDOWS_PREFIX) -schema: - $(verbose) rm scripts/rabbitmq.schema +build-schema: + $(verbose) rm -rf scripts/rabbitmq.schema $(verbose) cat schema/*.schema > scripts/rabbitmq.schema $(verbose) cp cuttlefish scripts/cuttlefish -install-windows-scripts: schema +install-windows-scripts: build-schema $(verbose) mkdir -p $(DESTDIR)$(WINDOWS_PREFIX)/sbin $(inst_verbose) for script in $(WINDOWS_SCRIPTS); do \ cp "scripts/$$script" "$(DESTDIR)$(WINDOWS_PREFIX)/sbin"; \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 26145d5394..15dcab6616 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -41,15 +41,15 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
-if exist "!RABBITMQ_CONFIG_FILE!.config" (
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
-) else (
+set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
+
+if not exist "!RABBITMQ_CONFIG_FILE!.config" (
if exist "!RABBITMQ_CONFIG_FILE!.conf" (
del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
"!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq"
)
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index deddba11ec..9d098f20da 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -113,15 +113,15 @@ if errorlevel 1 ( set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
-if exist "!RABBITMQ_CONFIG_FILE!.config" (
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
-) else (
-if exist "!RABBITMQ_CONFIG_FILE!.conf" (
+set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_CONFIG_FILE!"
+
+if not exist "!RABBITMQ_CONFIG_FILE!.config" (
+ if exist "!RABBITMQ_CONFIG_FILE!.conf" (
del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"
"!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq
ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"
- set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"
+ set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq"
)
)
@@ -190,7 +190,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^
-rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^
-rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^
--rabbit windows_service_config \""!RABBITMQ_CONFIG_FILE:\=/!"\" ^
+-rabbit windows_service_config \""!RABBITMQ_CONFIG_FILE_ACTUAL:\=/!"\" ^
-os_mon start_cpu_sup false ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index def466701a..d7915e3bce 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -809,7 +809,7 @@ config_files() -> config_setting() -> case application:get_env(rabbit, windows_service_config) of {ok, File1} -> File1; - undefined -> case os:getenv("RABBITMQ_CONFIG_FILE") of + undefined -> case os:getenv("RABBITMQ_CONFIG_FILE_ACTUAL") of false -> none; File2 -> File2 end |