diff --git a/Dockerfile b/Dockerfile index 956614e..d013207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ ENV GN_DIR /opt/geonetwork # Override log4j as we need to add our log appear, by default ROOT level is off which is very strange design COPY ./geonetwork/target/classes/log4j-imos.xml ${GN_DIR}/WEB-INF/classes/log4j2.xml +COPY ./geonetwork/target/classes/log4j-imos-index.xml ${GN_DIR}/WEB-INF/classes/log4j2-index.xml # Copy our jar to the lib folder so that scan can happens COPY ./geonetwork/target/geonetwork-*.jar ${GN_DIR}/WEB-INF/lib/ diff --git a/docker-es-compose.yml b/docker-es-compose.yml index eb0433b..fd56921 100644 --- a/docker-es-compose.yml +++ b/docker-es-compose.yml @@ -54,6 +54,8 @@ services: retries: 120 start_period: 20s + # Intended to set the max to 1G to match the cloud dev env, this can simulate issue with running in + # low memory environment. es-container: container_name: es-container hostname: es-container @@ -73,7 +75,7 @@ services: env_file: - .env environment: - - ES_JAVA_OPTS=-Xms3g -Xmx4g + - ES_JAVA_OPTS=-Xms512m -Xmx1g - xpack.security.enabled=true - xpack.security.authc.api_key.enabled=true - xpack.security.http.ssl.enabled=true diff --git a/docker-gn-compose.yml b/docker-gn-compose.yml index 412327d..ec580df 100644 --- a/docker-gn-compose.yml +++ b/docker-gn-compose.yml @@ -33,6 +33,7 @@ services: env_file: - .env environment: + # If log is not working, add this to JAVA_OPTS to check what is going on -Dlog4j2.debug JAVA_OPTS: >- -Xms256m -Xmx2g -Dspring.profiles.active=edge diff --git a/geonetwork/src/main/resources/log4j-imos-index.xml b/geonetwork/src/main/resources/log4j-imos-index.xml new file mode 100644 index 0000000..fd151d1 --- /dev/null +++ b/geonetwork/src/main/resources/log4j-imos-index.xml @@ -0,0 +1,150 @@ + + + + . + + + + + + + ${sys:log_dir:-log_dir}/logs/geonetwork.log + ${sys:log_dir:-log_dir}/logs/geonetwork.log-%i.log + + + + + + + + + + + + + %date{ISO8601}{${ctx:timeZone}} %-5level [%logger] - %message%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/geonetwork/src/main/resources/log4j-imos.xml b/geonetwork/src/main/resources/log4j-imos.xml index 3d6d179..7952acf 100644 --- a/geonetwork/src/main/resources/log4j-imos.xml +++ b/geonetwork/src/main/resources/log4j-imos.xml @@ -1,251 +1,151 @@ - - + + + ./logs + + + + + + + ${sys:log_dir:-log_dir}/geonetwork.log + ${sys:log_dir:-log_dir}/geonetwork.log-%i.log + + + + + + + + + + + + + %date{ISO8601}{${ctx:timeZone}} %-5level [%logger] - %message%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - + + + + + + + + + + +