diff --git a/.gitignore b/.gitignore index 3ecf29de6..fdad56268 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ node_modules /frontend/resources/public/* /exporter/target /exporter/.shadow-cljs -/docker/images/bundle +/docker/images/bundle* /.clj-kondo/.cache /bundle* /media diff --git a/backend/resources/log4j2-bundle.xml b/backend/resources/log4j2-bundle.xml deleted file mode 100644 index 8ebe2de44..000000000 --- a/backend/resources/log4j2-bundle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/resources/log4j2-devenv.xml b/backend/resources/log4j2-devenv.xml new file mode 100644 index 000000000..3c18f6bd3 --- /dev/null +++ b/backend/resources/log4j2-devenv.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 3c18f6bd3..660f8075a 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -1,43 +1,21 @@ - + - - - - - - - - - - + - - - - - - - - - - - - - - - + + - + diff --git a/backend/scripts/build.sh b/backend/scripts/build.sh index 57b2e3057..a80941656 100755 --- a/backend/scripts/build.sh +++ b/backend/scripts/build.sh @@ -14,7 +14,7 @@ for item in $(echo $CLASSPATH | tr ":" "\n"); do fi done -cp ./resources/log4j2-bundle.xml ./target/dist/log4j2.xml +cp ./resources/log4j2.xml ./target/dist/log4j2.xml cp -r ./src ./target/dist/main cp -r ./resources/emails ./target/dist/main/ cp -r ./resources/svgclean.js ./target/dist/main/ @@ -45,7 +45,7 @@ if [ -f ./environ ]; then fi set -x -exec \$JAVA_CMD \$JVM_OPTS -classpath \$CP -Dlog4j.configurationFile=./log4j2.xml "\$@" clojure.main -m app.main +exec \$JAVA_CMD \$JVM_OPTS -classpath \$CP -Dlog4j2.configurationFile=./log4j2.xml "\$@" clojure.main -m app.main EOF tee -a ./target/dist/manage.sh >> /dev/null <