From 709c56f1642c4cb0a505bc86f87a82b275b3edb3 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 14 Nov 2022 07:25:10 +0100
Subject: [PATCH] Added logging level
---
.env.unix.example | 2 +-
.env.win.example | 2 +-
fda-authentication-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-container-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-database-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-discovery-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-gateway-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-identifier-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-metadata-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-query-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-table-service/Dockerfile | 5 +-
.../src/main/resources/application-docker.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
fda-ui-proxy/.gitignore | 1 -
fda-ui-proxy/nginx.conf | 67 -------------------
31 files changed, 47 insertions(+), 106 deletions(-)
delete mode 100644 fda-ui-proxy/.gitignore
delete mode 100644 fda-ui-proxy/nginx.conf
diff --git a/.env.unix.example b/.env.unix.example
index b89114ae28..9743a64539 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
WEBSITE=http://example.com
TOKEN_MAX=5
-LOGO=/path/to/logo.png
MAIL_FROM="Database Repository <noreply@example.com>"
MAIL_REPLY_TO="Admin <somebody@example.com>"
MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
JWT_EXPIRATION=86400000
EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=/tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/.env.win.example b/.env.win.example
index ebf5810583..2cb7c72b6a 100644
--- a/.env.win.example
+++ b/.env.win.example
@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
WEBSITE=http://example.com
TOKEN_MAX=5
-LOGO=/path/to/logo.png
MAIL_FROM="Database Repository <noreply@example.com>"
MAIL_REPLY_TO="Admin <somebody@example.com>"
MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
JWT_EXPIRATION=86400000
EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=C:\tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 6aad7a07c7..42dece92fa 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -39,6 +39,7 @@ ENV SMTP_HOST=""
ENV SMTP_PORT=""
ENV SMTP_USERNAME=""
ENV SMTP_PASSWORD=""
+ENV LOG_LEVEL=debug
VOLUME /tmp
@@ -47,8 +48,8 @@ RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./authentication-service.jar
EXPOSE 9097
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./authentication-service.jar"]
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 3bf442138d..441da8934f 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -37,7 +37,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: authentication-service
diff --git a/fda-authentication-service/rest-service/src/main/resources/application.yml b/fda-authentication-service/rest-service/src/main/resources/application.yml
index 91bb7331ae..7b1f6a1cc6 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application.yml
@@ -40,7 +40,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: authentication-service
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index 3a7b9d7788..3bea5887a3 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -28,14 +28,15 @@ ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
ENV SHARED_FILESYSTEM=/tmp
ENV USER_NETWORK=userdb
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./container-service.jar
EXPOSE 9091
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./container-service.jar"]
diff --git a/fda-container-service/rest-service/src/main/resources/application-docker.yml b/fda-container-service/rest-service/src/main/resources/application-docker.yml
index 9ec1d41c3b..f5efc5076a 100644
--- a/fda-container-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-docker.yml
@@ -27,7 +27,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: container-service
diff --git a/fda-container-service/rest-service/src/main/resources/application.yml b/fda-container-service/rest-service/src/main/resources/application.yml
index 11a60e0af8..1225af6d05 100644
--- a/fda-container-service/rest-service/src/main/resources/application.yml
+++ b/fda-container-service/rest-service/src/main/resources/application.yml
@@ -27,7 +27,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: container-service
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index 831da8e400..a6f4b9a8f9 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -30,14 +30,15 @@ ENV SEARCH_ENDPOINT=search-service
ENV SEARCH_USERNAME=elastic
ENV SEARCH_PASSWORD=elastic
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./database-service.jar
EXPOSE 9092
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./database-service.jar"]
diff --git a/fda-database-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
index 6ba79bcfcf..046b4830af 100644
--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: database-service
diff --git a/fda-database-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
index 625d22eb41..748dcc1668 100644
--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: database-service
diff --git a/fda-discovery-service/Dockerfile b/fda-discovery-service/Dockerfile
index e50ca904bb..0f8441c290 100644
--- a/fda-discovery-service/Dockerfile
+++ b/fda-discovery-service/Dockerfile
@@ -18,14 +18,15 @@ FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
ENV METADATA_USERNAME=postgres
ENV METADATA_PASSWORD=postgres
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./discovery/target/discovery-*.jar ./discovery.jar
+COPY --from=build ./discovery/target/discovery-*.jar ./discovery-service.jar
EXPOSE 9090
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery-service.jar"]
diff --git a/fda-discovery-service/discovery/src/main/resources/application-docker.yml b/fda-discovery-service/discovery/src/main/resources/application-docker.yml
index e02960ca68..074b27b10c 100644
--- a/fda-discovery-service/discovery/src/main/resources/application-docker.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application-docker.yml
@@ -22,7 +22,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
eureka.client.register-with-eureka: false
diff --git a/fda-discovery-service/discovery/src/main/resources/application.yml b/fda-discovery-service/discovery/src/main/resources/application.yml
index c0aef96960..6cd73409b3 100644
--- a/fda-discovery-service/discovery/src/main/resources/application.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application.yml
@@ -22,7 +22,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
eureka.client.register-with-eureka: false
diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile
index c5e68eaf20..abc5835089 100644
--- a/fda-gateway-service/Dockerfile
+++ b/fda-gateway-service/Dockerfile
@@ -19,14 +19,15 @@ ENV METADATA_DB=fda
ENV METADATA_USERNAME=postgres
ENV METADATA_PASSWORD=postgres
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./gateway/target/gateway-*.jar ./gateway.jar
+COPY --from=build ./gateway/target/gateway-*.jar ./gateway-service.jar
EXPOSE 9095
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway-service.jar"]
\ No newline at end of file
diff --git a/fda-gateway-service/gateway/src/main/resources/application-docker.yml b/fda-gateway-service/gateway/src/main/resources/application-docker.yml
index 621804ff53..2bb501fcb0 100644
--- a/fda-gateway-service/gateway/src/main/resources/application-docker.yml
+++ b/fda-gateway-service/gateway/src/main/resources/application-docker.yml
@@ -23,7 +23,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: discovery-service
diff --git a/fda-gateway-service/gateway/src/main/resources/application.yml b/fda-gateway-service/gateway/src/main/resources/application.yml
index 621804ff53..2bb501fcb0 100644
--- a/fda-gateway-service/gateway/src/main/resources/application.yml
+++ b/fda-gateway-service/gateway/src/main/resources/application.yml
@@ -23,7 +23,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: discovery-service
diff --git a/fda-identifier-service/Dockerfile b/fda-identifier-service/Dockerfile
index 6637e5178e..3db7b8b6f7 100644
--- a/fda-identifier-service/Dockerfile
+++ b/fda-identifier-service/Dockerfile
@@ -27,14 +27,15 @@ ENV METADATA_USERNAME=postgres
ENV METADATA_PASSWORD=postgres
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
ENV WEBSITE=http://localhost:3000
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./identifier-service.jar
EXPOSE 9096
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./identifier-service.jar"]
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
index 25b6a277be..08df9cacc9 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
@@ -26,7 +26,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: identifier-service
diff --git a/fda-identifier-service/rest-service/src/main/resources/application.yml b/fda-identifier-service/rest-service/src/main/resources/application.yml
index f7ca452326..f9a20af403 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application.yml
@@ -26,7 +26,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: identifier-service
diff --git a/fda-metadata-service/Dockerfile b/fda-metadata-service/Dockerfile
index a2b62e9d9c..a727f81379 100644
--- a/fda-metadata-service/Dockerfile
+++ b/fda-metadata-service/Dockerfile
@@ -32,14 +32,15 @@ ENV ADMIN_MAIL="noreply@example.com"
ENV EARLIEST_DATESTAMP="2022-09-17T18:23:00Z"
ENV DELETED_RECORD=persistent
ENV GRANULARITY="YYYY-MM-DDThh:mm:ssZ"
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./metadata-service.jar
EXPOSE 9090
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./metadata-service.jar"]
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
index fe79ce9d79..3ec8cd5070 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
@@ -25,7 +25,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: metadata-service
diff --git a/fda-metadata-service/rest-service/src/main/resources/application.yml b/fda-metadata-service/rest-service/src/main/resources/application.yml
index 9c26043e2c..307ead383f 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application.yml
@@ -29,7 +29,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: metadata-service
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index b6acf3862e..b2dac0fa18 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -30,14 +30,15 @@ ENV BROKER_PASSWORD=fda
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
ENV SHARED_FILESYSTEM=/tmp
ENV BROKER_CONSUMERS=2
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./query-service.jar
EXPOSE 9093
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./query-service.jar"]
diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.yml b/fda-query-service/rest-service/src/main/resources/application-docker.yml
index beec8183b3..933074053e 100644
--- a/fda-query-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: query-service
diff --git a/fda-query-service/rest-service/src/main/resources/application.yml b/fda-query-service/rest-service/src/main/resources/application.yml
index b5eecf060b..4139a27347 100644
--- a/fda-query-service/rest-service/src/main/resources/application.yml
+++ b/fda-query-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: query-service
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 0bcf5e9c2d..e0849c308f 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -30,14 +30,15 @@ ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
ENV SEARCH_ENDPOINT=search-service
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
COPY ./service_ready /usr/bin
RUN chmod +x /usr/bin/service_ready
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./table-service.jar
EXPOSE 9094
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./table-service.jar"]
diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.yml b/fda-table-service/rest-service/src/main/resources/application-docker.yml
index a1431ca2e0..b5a642f22e 100644
--- a/fda-table-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: table-service
diff --git a/fda-table-service/rest-service/src/main/resources/application.yml b/fda-table-service/rest-service/src/main/resources/application.yml
index 1d73957f55..1762a05690 100644
--- a/fda-table-service/rest-service/src/main/resources/application.yml
+++ b/fda-table-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
root: warn
- at.tuwien.: trace
+ at.tuwien.: "${LOG_LEVEL}"
org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
eureka:
instance.hostname: table-service
diff --git a/fda-ui-proxy/.gitignore b/fda-ui-proxy/.gitignore
deleted file mode 100644
index 4d3dae74c8..0000000000
--- a/fda-ui-proxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-default/
diff --git a/fda-ui-proxy/nginx.conf b/fda-ui-proxy/nginx.conf
deleted file mode 100644
index e7cfce7879..0000000000
--- a/fda-ui-proxy/nginx.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# For more information on configuration, see:
-# * Official English Documentation: http://nginx.org/en/docs/
-# * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error_log;
-pid /var/run/nginx.pid;
-
-# Load dynamic modules. See /usr/share/nginx/README.dynamic.
-# include /etc/nginx/modules.d/*.conf;
-
-events {
- worker_connections 1024;
-}
-
-http {
- log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
-
- access_log /var/log/nginx/access_log main;
-
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- keepalive_timeout 65;
- types_hash_max_size 2048;
- client_max_body_size 100G;
-
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
- # Load modular configuration files from the /etc/nginx/conf.d directory.
- # See http://nginx.org/en/docs/ngx_core_module.html#include
- # for more information.
- include /etc/nginx/conf.d/*.conf;
-
- server {
- listen 80 default_server;
- server_name _;
- return 301 https://$host$request_uri;
- }
-
- server {
-
- listen 443 ssl;
- server_name dbrepo.ossdip.at;
-
- access_log /var/log/nginx/dbrepo.access.log;
-
- ssl_certificate /etc/nginx/fullchain.pem;
- ssl_certificate_key /etc/nginx/privkey.pem;
-
- location / {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://ui:3000;
- proxy_read_timeout 90;
- proxy_redirect http://ui:3000 https://dbrepo.ossdip.at;
- }
-
- }
-
-}
--
GitLab