jembi · MatthewErispe · Sep 25, 2024 · Jul 22, 2024 · Jul 23, 2024 · Jul 24, 2024
diff --git a/.github/workflows/entry-on-merge.yml b/.github/workflows/entry-on-merge.yml
@@ -32,7 +32,7 @@ jobs:
     - id: get-docker-push-tag
       run: echo "docker-push-tag=$(git rev-parse --abbrev-ref HEAD)-$(git log -1 --pretty=format:%h)" >> $GITHUB_OUTPUT
     - uses: ./.github/workflows/actions/build-deploy-images
-      with: 
+      with:
         docker-push-tag: ${{ steps.get-docker-push-tag.outputs.docker-push-tag }}
         docker-host: "docker.io"
         docker-username: ${{ secrets.DOCKER_HUB_USER_NAME }}

diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,7 @@ my-notes
 .settings
 .classpath
 .project
-.metals
+.metals
+devops/benchmarking/k6
+devops/windows/base-docker-wsl/config
+devops/windows/base-docker-wsl/csv
diff --git a/JeMPI_Apps/JeMPI_API/docker/Dockerfile b/JeMPI_Apps/JeMPI_API/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_API/src/main/resources/application.conf
@@ -1,14 +1,28 @@
-akka.http {
-  session {
-    enabled = true
+akka {
+  http {
+    session {
+      enabled = true
+    }
+    host-connection-pool {
+      max-connections = 1024
+      max-open-requests = 1024
+    }
+    server {
+      idle-timeout = 60 s
+      request-timeout = 60 s
+      linger-timeout = 60 s
+      parsing {
+          max-to-strict-bytes = 128m
+          max-to-strict-bytes = ${?JEMPI_FILE_IMPORT_MAX_SIZE_BYTE}
+      }
+    }
   }
-  server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
-    parsing {
-        max-to-strict-bytes = 128m
-        max-to-strict-bytes = ${?JEMPI_FILE_IMPORT_MAX_SIZE_BYTE}
+  actor {
+    default-dispatcher {
+      fork-join-executor {
+        parallelism-min = 8
+        parallelism-max = 64
+      }
     }
   }
 }
@@ -71,7 +85,7 @@ my-blocking-dispatcher {
   type = Dispatcher
   executor = "thread-pool-executor"
   thread-pool-executor {
-    fixed-pool-size = 512
+    fixed-pool-size = 1024
   }
   throughput = 1
 }
diff --git a/JeMPI_Apps/JeMPI_API_KC/docker/Dockerfile b/JeMPI_Apps/JeMPI_API_KC/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_API_KC/src/main/resources/application.conf
@@ -1,14 +1,28 @@
-akka.http {
-  session {
-    enabled = true
+akka {
+  http {
+    session {
+      enabled = true
+    }
+    host-connection-pool {
+      max-connections = 1024
+      max-open-requests = 1024
+    }
+    server {
+      idle-timeout = 60 s
+      request-timeout = 60 s
+      linger-timeout = 60 s
+      parsing {
+          max-to-strict-bytes = 128m
+          max-to-strict-bytes = ${?JEMPI_FILE_IMPORT_MAX_SIZE_BYTE}
+      }
+    }
   }
-  server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
-    parsing {
-        max-to-strict-bytes = 128m
-        max-to-strict-bytes = ${?JEMPI_FILE_IMPORT_MAX_SIZE_BYTE}
+  actor {
+    default-dispatcher {
+      fork-join-executor {
+        parallelism-min = 8
+        parallelism-max = 64
+      }
     }
   }
 }
@@ -98,7 +112,7 @@ my-blocking-dispatcher {
   type = Dispatcher
   executor = "thread-pool-executor"
   thread-pool-executor {
-    fixed-pool-size = 512
+    fixed-pool-size = 1024
   }
   throughput = 1
 }
diff --git a/JeMPI_Apps/JeMPI_AsyncReceiver/docker/Dockerfile b/JeMPI_Apps/JeMPI_AsyncReceiver/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver/Main.java b/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver/Main.java
@@ -174,7 +174,7 @@ private void apacheReadCSV(
                if (givenName.isEmpty() && familyName.isEmpty()) {
                   partitionKey += "Unknown";
                }
-               LOGGER.info("Kafka topic/partition for patient: " + partitionKey);
+               LOGGER.info("Using Kafka topic/partition: " + partitionKey);
 
                final var interactionEnvelop = new InteractionEnvelop(InteractionEnvelop.ContentType.BATCH_INTERACTION,
                                                                      tag,

diff --git a/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/resources/application.conf
@@ -1,8 +1,8 @@
 akka.http {
   server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
+    idle-timeout = 60 s
+    request-timeout = 60 s
+    linger-timeout = 60 s
   }
 }
 

diff --git a/JeMPI_Apps/JeMPI_BackupRestoreAPI/docker/Dockerfile b/JeMPI_Apps/JeMPI_BackupRestoreAPI/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_BackupRestoreAPI/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_BackupRestoreAPI/src/main/resources/application.conf
@@ -3,9 +3,9 @@ akka.http {
     enabled = true
   }
   server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
+    idle-timeout = 60 s
+    request-timeout = 60 s
+    linger-timeout = 60 s
   }
 }
 

diff --git a/JeMPI_Apps/JeMPI_Bootstrapper/docker/Dockerfile b/JeMPI_Apps/JeMPI_Bootstrapper/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_Controller/docker/Dockerfile b/JeMPI_Apps/JeMPI_Controller/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_Controller/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_Controller/src/main/resources/application.conf
@@ -1,8 +1,8 @@
 akka.http {
   server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
+    idle-timeout = 60 s
+    request-timeout = 60 s
+    linger-timeout = 60 s
   }
 }
 

diff --git a/JeMPI_Apps/JeMPI_EM_Scala/docker/Dockerfile b/JeMPI_Apps/JeMPI_EM_Scala/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_ETL/docker/Dockerfile b/JeMPI_Apps/JeMPI_ETL/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION
+ARG JAVA_VERSION=21.0.1-tem
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 

diff --git a/JeMPI_Apps/JeMPI_ETL/src/main/resources/application.conf b/JeMPI_Apps/JeMPI_ETL/src/main/resources/application.conf
@@ -1,8 +1,8 @@
 akka.http {
   server {
-    idle-timeout = 10 s
-    request-timeout = 5 s
-    linger-timeout = 5 s
+    idle-timeout = 60 s
+    request-timeout = 60 s
+    linger-timeout = 60 s
   }
 }
 

diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java
@@ -20,7 +20,6 @@
 import org.jembi.jempi.shared.models.dashboard.NotificationStats;
 import org.jembi.jempi.shared.models.dashboard.SQLDashboardData;
 import org.jembi.jempi.shared.utils.AppUtils;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -469,7 +468,14 @@ private Behavior<Event> postUploadCsvFileHandler(final PostUploadCsvFileRequest
          if (request.uploadConfig != null) {
             appendUploadConfigToFile(request.uploadConfig, file);
          }
-         Files.move(file.toPath(), Paths.get("/app/csv/" + file.getName()));
+         Path ubuntuFilePath = new File(String.format("/app/csv")).toPath();
+         if (Files.exists(ubuntuFilePath)) {
+            Files.move(file.toPath(), Paths.get("/app/csv/" + file.getName()));
+         } else {
+            final String configDir = System.getenv("SYSTEM_CSV_DIR");
+            Path filePath = Paths.get(configDir, file.getName());
+            Files.move(file.toPath(), filePath);
+         }
       } catch (NoSuchFileException e) {
          LOGGER.error("No such file");
       } catch (SecurityException | IOException e) {
@@ -510,8 +516,17 @@ private Behavior<Event> getConfigurationHandler(final GetConfigurationRequest re
 
    private Behavior<Event> getFieldsConfigurationHandler(final GetFieldsConfigurationRequest request) {
       final var separator = FileSystems.getDefault().getSeparator();
-      final var filePath =
-            new File("%sapp%sconf_system%s%s".formatted(separator, separator, separator, fieldsConfigurationFileName)).toPath();
+      final String configDir = System.getenv("SYSTEM_CONFIG_DIRS");
+      Path filePath = Paths.get(""); // Start with an empty path
+        // Create ubuntuFilePath
+      Path ubuntuFilePath = new File(String.format("%sapp%sconf_system%s%s", separator, separator, separator, fieldsConfigurationFileName)).toPath();
+      // Check if ubuntuFilePath exists
+      if (Files.exists(ubuntuFilePath)) {
+         filePath = ubuntuFilePath;
+      } else {
+         // If ubuntuFilePath does not exist, assign the alternative path
+         filePath = Paths.get(configDir, "config-api.json");
+      }
       try {
          String configFileContent = new String(Files.readAllBytes(filePath), StandardCharsets.UTF_8);
          FieldsConfiguration fieldsConfiguration = AppUtils.OBJECT_MAPPER.readValue(configFileContent, FieldsConfiguration.class);

diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/ProxyRoutes.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/ProxyRoutes.java
@@ -532,7 +532,7 @@ static Route proxyPostDashboardData(
                                  responseBody = Unmarshaller
                                        .entityToString()
                                        .unmarshal(dashboardDataResponse.entity(), actorSystem)
-                                       .toCompletableFuture().get(10, TimeUnit.SECONDS);
+                                       .toCompletableFuture().get(GlobalConstants.TIMEOUT_GENERAL_SECS, TimeUnit.SECONDS);
                               } catch (InterruptedException | ExecutionException | TimeoutException e) {
                                  LOGGER.error("Error getting dashboard data ", e);
                                  return complete(StatusCodes.INTERNAL_SERVER_ERROR);