Generation called from inside erlang only

4 files changed, 40 insertions, 31 deletions

diff --git a/scripts/generate-config b/scripts/generate-config
new file mode 100755
index 0000000000..475af2f9d2
--- /dev/null
+++ b/scripts/generate-config
@@ -0,0 +1,3 @@
+rm -rf ./generated/rabbitmq.config &&
+./cuttlefish -s ./schema -f rabbitmq $* &&
+mv ./generated/rabbitmq.*.config ./generated/rabbitmq.config
\ No newline at end of file
diff --git a/scripts/generate-config.bat b/scripts/generate-config.bat
new file mode 100644
index 0000000000..9cc6231d24
--- /dev/null
+++ b/scripts/generate-config.bat
@@ -0,0 +1,2 @@
+@echo off
+del ".\generated\rabbitmq.config" && del ".\generated\rabbitmq.*.config" && "%ERLANG_HOME%\bin\escript.exe" .\cuttlefish -i .\rabbitmq.schema %* -f rabbitmq && ren ".\generated\rabbitmq.*.config" "rabbitmq.config"
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 2a41f3e9cc..95bf009265 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -58,25 +58,24 @@ esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 
-generate_config() {
-    rm -rf ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
-    ./cuttlefish -e ${RABBITMQ_GENERATED_CONFIG_DIR} -s ./schema -c ${RABBITMQ_CONFIG_FILE}.conf -f rabbitmq
-    mv ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.*.config ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
-}
-
-if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
-    RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE
-else
-     
-    [ -f "${RABBITMQ_CONFIG_FILE}.conf" ] && 
-    [ -d $RABBITMQ_GENERATED_CONFIG_DIR ] && 
-    generate_config && 
-    RABBITMQ_CONFIG_FILE_ACTUAL="${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq"
-fi
+# generate_config() {
+#     rm -rf ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
+#     ./cuttlefish -e ${RABBITMQ_GENERATED_CONFIG_DIR} -s ./schema -c ${RABBITMQ_CONFIG_FILE}.conf -f rabbitmq
+#     mv ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.*.config ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config
+# }
+
+# if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
+#     RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE
+# else
+#     [ -f "${RABBITMQ_CONFIG_FILE}.conf" ] && 
+#     [ -d $RABBITMQ_GENERATED_CONFIG_DIR ] && 
+#     generate_config && 
+#     RABBITMQ_CONFIG_FILE_ACTUAL="${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq"
+# fi
 
 set +e
 
-RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE_ACTUAL \
+RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
 RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
     -boot "${CLEAN_BOOT_FILE}" \
@@ -99,8 +98,11 @@ fi
 
 set -e
 
-RABBITMQ_CONFIG_ARG=
-[ -f "${RABBITMQ_CONFIG_FILE_ACTUAL}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_ACTUAL}"
+if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
+    RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
+elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
+    RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} -conf_gen_script `dirname $0`/generate-config"
+fi
 
 RABBITMQ_LISTEN_ARG=
 [ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]"
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 15dcab6616..3e3faca535 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -41,17 +41,17 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

-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"

-    )

-)

+set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"

+

+rem if not exist "!RABBITMQ_CONFIG_FILE!.config" (

+rem     if exist "!RABBITMQ_CONFIG_FILE!.conf" (

+rem         del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.config"

+rem         del "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config"

+rem         "!ERLANG_HOME!\bin\escript.exe" .\cuttlefish -e "!RABBITMQ_GENERATED_CONFIG_DIR!" -i .\rabbitmq.schema -c "!RABBITMQ_CONFIG_FILE!.conf" -f rabbitmq

+rem         ren "!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq.*.config" "rabbitmq.config"

+rem         set RABBITMQ_CONFIG_FILE_ACTUAL="!RABBITMQ_GENERATED_CONFIG_DIR!\generated\rabbitmq"

+rem     )

+rem )

 

 "!ERLANG_HOME!\bin\erl.exe" ^

         -pa "!RABBITMQ_EBIN_ROOT!" ^

@@ -70,8 +70,10 @@ if ERRORLEVEL 2 (
 

 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

 

-if exist "!RABBITMQ_CONFIG_FILE_ACTUAL!.config" (

-    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_ACTUAL!"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

+) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (

+    set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" -conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" -conf_gen_script "%TDP0%/generate-config.bat"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )