Merge branch 'main' of...

Merge branch 'main' of gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/tangoarchivinggraphqlextractor

pom.xml

@@ -47,12 +47,20 @@
                 <version>2.7.3</version>
                 <configuration>
                     <mainClass>fr.soleil.archiving.datafetch.graphql.TangoArchivingGQLExtractorApplication</mainClass>
+                    <jmxPort>9036</jmxPort> <!-- JMX port (https://docs.spring.io/spring-boot/docs/2.5.2/maven-plugin/reference/htmlsingle/#integration-tests.examples.jmx-port )  -->
                     <image>
                         <env>
                             <HTTP_PROXY>http://proxy.synchrotron-soleil.fr:8080</HTTP_PROXY>
                             <HTTPS_PROXY>http://proxy.synchrotron-soleil.fr:8080</HTTPS_PROXY>
+                            <BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS> <!-- Appends to the list of java JVM args with a space: https://stackoverflow.com/questions/61855229/how-to-set-jvm-arguments-when-running-mvn-spring-bootbuild-image-command-in-spr -->
+                            <BPE_APPEND_JAVA_TOOL_OPTIONS>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/workspace/log/Hdump.log -XX:ErrorFile=/workspace/log/error.log -Dcom.sun.management.jmxremote=true -Djava.awt.headless=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.port=9036 -Dcom.sun.management.jmxremote.rmi.port=9036 -Dcom.sun.management.jmxremote.host=0.0.0.0</BPE_APPEND_JAVA_TOOL_OPTIONS> <!-- JVM options go here -->
+                            <BPL_JMX_ENABLED>true</BPL_JMX_ENABLED>
+                            <BPL_JMX_PORT>9036</BPL_JMX_PORT>
                             <BP_HEALTH_CHECKER_ENABLED>true</BP_HEALTH_CHECKER_ENABLED>
                         </env>
+                        <bindings>
+                            <binding>/var/log/graphql:/workspace/log:rw</binding>
+                        </bindings>
                         <!-- https://stackoverflow.com/questions/75885269/spring-boot-build-image-with-health-check -->
                         <buildpacks>
                             <buildpack>urn:cnb:builder:paketo-buildpacks/java</buildpack>

src/main/resources/config/application-dev-hdb.yml

@@ -10,6 +10,8 @@ application:
   log4jdbc: false
   updateInterval: 1000
 graphql:
+  graphiql:
+    enabled: true
   voyager:
     enabled: true
     basePath: /

src/main/resources/logback-spring.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
+    <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/workspace/log/app.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>/workspace/log/logFile.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -- %msg%n</pattern>
+        </encoder>
+    </appender>
+
     <springProfile name="dev">
         <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
         <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+        <property name="LOG_FILE" value="/workspace/log/datafetcher.log"/>
+        <include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
         <logger name="org.tango" level="INFO"/>
         <logger name="jdbc.sqltiming" level="DEBUG"/>
         <logger name="jdbc.resultset" level="ERROR"/>
@@ -16,6 +30,7 @@
         <logger name="com.zaxxer" level="INFO" />
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="ROLLING"/>
         </root>
     </springProfile>
 
@@ -66,8 +81,8 @@
     <springProfile name="prod-hdb">
         <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
         <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-        <!--property name="LOG_FILE" value="/var/log/archiving/hdb-datafetcher.log"/>
-        <include resource="org/springframework/boot/logging/logback/file-appender.xml"/-->
+        <property name="LOG_FILE" value="/workspace/log/hdb-datafetcher.log"/>
+        <include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
         <logger name="org.jdbi" level="DEBUG"/>
         <logger name="fr.soleil.archiving.datafetch" level="DEBUG"/>
         <logger name="fr.soleil.archiving.datafetch.graphql.utils" level="DEBUG"/>