From 2e92a9410798b11b04ff1b11de0f3f87328d6058 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Fri, 12 Apr 2019 16:33:31 +0200
Subject: [PATCH] Update Akka configuration
---
src/main/resources/application.conf | 16 +-
src/main/resources/reference.conf | 371 +++++++++++++---------------
2 files changed, 189 insertions(+), 198 deletions(-)
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 137746494..08fc3d01d 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -1,2 +1,14 @@
-# No specific configuration for Portal backend
-# All configuration is related to Akka
+app {
+ # Name of the application
+ name = "Portal backend"
+ # Type of the application
+ type = "Spring"
+ clusterSystemName = ${clustering.cluster.name}
+}
+
+clustering {
+ ip = "127.0.0.1"
+ ip = ${?CLUSTER_IP}
+ port = 4489
+ port = ${?CLUSTER_PORT}
+}
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index c503a47ab..64657b681 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -1,27 +1,4 @@
-app {
- # Name of the application
- name = "Portal backend"
- # Type of the application
- type = "Spring"
- clusterSystemName = ${clustering.cluster.name}
-}
-
-# Merged with defaults in woken-messages/reference.conf
-clustering {
- ip = "127.0.0.1"
- ip = ${?CLUSTER_IP}
- port = 4489
- port = ${?CLUSTER_PORT}
-}
-
-# Merged with defaults in woken-messages/reference.conf
-clustering {
- ip = "127.0.0.1"
- ip = ${?CLUSTER_IP}
- port = 8088
- port = ${?CLUSTER_PORT}
-}
# ============================================ #
# kamon-system-metrics reference configuration #
# ============================================ #
@@ -2605,180 +2582,7 @@ akka {
}
}
-# ========================================= #
-# Shared Woken Reference Configuration #
-# ========================================= #
-
-app {
- # Name of the application
- name = ""
- name = ${?APP_NAME}
- # Type of the application
- type = "Scala"
- type = ${?APP_TYPE}
- # Version of the application
- version = ""
- version = ${?VERSION}
- # Date when this application was built
- buildDate = ""
- buildDate = ${?BUILD_DATE}
-}
-
-datacenter {
- # Location of the datacenter
- location = "dev"
- location = ${?DATA_CENTER_LOCATION}
- host = ""
- host = ${?HOST}
- host = ${?DATA_CENTER_SERVER}
- # Container orchestration
- containerOrchestration = "mesos"
- containerOrchestration = ${?CONTAINER_ORCHESTRATION}
- # Mesos properties
- mesos {
- containerName = ""
- containerName = ${?MESOS_CONTAINER_NAME}
- dockerImage = ""
- dockerImage = ${?MARATHON_APP_DOCKER_IMAGE}
- resourceCpu = ""
- resourceCpu = ${?MARATHON_APP_RESOURCE_CPUS}
- resourceMem = ""
- resourceMem = ${?MARATHON_APP_RESOURCE_MEM}
- labels = ""
- labels = ${?MARATHON_APP_LABELS}
- }
-}
-
-bugsnag {
- apiKey = ""
- apiKey = ${?BUGSNAG_KEY}
- # Release stage used when reporting errors. Values are dev, staging, production
- releaseStage = "dev"
- releaseStage = ${?RELEASE_STAGE}
-}
-
-# Common settings for Akka
-
-akka {
- loglevel = "WARNING"
- loglevel = ${?AKKA_LOG_LEVEL}
- stdout-loglevel = "WARNING"
- stdout-loglevel = ${?AKKA_LOG_LEVEL}
- loggers = ["akka.event.slf4j.Slf4jLogger"]
- logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
-
- log-config-on-start = off
- log-config-on-start = ${?AKKA_LOG_CONFIG}
-
- log-dead-letters = 10
- log-dead-letters-during-shutdown = off
-
- coordinated-shutdown.terminate-actor-system = on
-
- actor {
- # provider = "cluster"
-
- debug {
- receive = on
- autoreceive = off
- lifecycle = on
- fsm = off
- unhandled = on
- event-stream = off
- }
-
- serializers {
- woken-messages-serializer = "ch.chuv.lren.woken.messages.AkkaSerializer"
- }
-
- serialization-bindings {
- "ch.chuv.lren.woken.messages.Ping" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.Pong" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.ComponentQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.ComponentQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.VersionQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.VersionResponse" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.datasets.DatasetsQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.datasets.DatasetsResponse" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.datasets.TablesQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.datasets.TablesResponse" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.query.MethodsQuery$" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.query.MethodsResponse" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.query.MiningQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.query.ExperimentQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.query.QueryResult" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.validation.ValidationQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.validation.ValidationResult" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.validation.ScoringQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.validation.ScoringResult" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.variables.VariablesForDatasetsQuery" = woken-messages-serializer
- "ch.chuv.lren.woken.messages.variables.VariablesForDatasetsResponse" = woken-messages-serializer
- }
-
- enable-additional-serialization-bindings = on
- allow-java-serialization = off
-
- }
-
- remote {
- log-sent-messages = off
- log-received-messages = off
- log-remote-lifecycle-events = off
-
- watch-failure-detector {
- acceptable-heartbeat-pause = 20 s
- }
-
- }
-
- http {
- server {
- idle-timeout = 300s
- request-timeout = 180s
- ssl-encryption = off
- ssl-tracing = on
- }
-
- client {
- idle-timeout = 300s
- request-timeout = 20 s
- }
-
- host-connection-pool {
- max-connections = 128
- max-open-requests = 128
- }
- }
-
-}
-
-remoting {
-
- implementation = "artery"
- # Alternative option is 'netty'
- implementation = ${?AKKA_REMOTING}
-
-}
-
-clustering {
- # IP address advertised by the Akka server
- ip = "127.0.0.1"
- ip = ${?CLUSTER_IP}
- # Define the default Akka port for your app
- port = 8088
- port = ${?CLUSTER_PORT}
-
- # Definition of the seed used to bootstrap the cluster
- seed-ip = "127.0.0.1"
- seed-ip = ${?CLUSTER_IP}
- seed-ip = ${?WOKEN_PORT_8088_TCP_ADDR}
- seed-port = 8088
- seed-port = ${?WOKEN_PORT_8088_TCP_PORT}
- # Name of the Akka cluster
- cluster.name = "woken"
- cluster.name = ${?CLUSTER_NAME}
-}
########################################
# akka-http-cors Reference Config File #
########################################
@@ -4881,3 +4685,178 @@ ssl-config {
}
}
+
+# ========================================= #
+# Shared Woken Reference Configuration #
+# ========================================= #
+
+app {
+ # Name of the application
+ name = ""
+ name = ${?APP_NAME}
+ # Type of the application
+ type = "Scala"
+ type = ${?APP_TYPE}
+ # Version of the application
+ version = ""
+ version = ${?VERSION}
+ # Date when this application was built
+ buildDate = ""
+ buildDate = ${?BUILD_DATE}
+}
+
+datacenter {
+ # Location of the datacenter
+ location = "dev"
+ location = ${?DATA_CENTER_LOCATION}
+ host = ""
+ host = ${?HOST}
+ host = ${?DATA_CENTER_SERVER}
+ # Container orchestration
+ containerOrchestration = "mesos"
+ containerOrchestration = ${?CONTAINER_ORCHESTRATION}
+ # Mesos properties
+ mesos {
+ containerName = ""
+ containerName = ${?MESOS_CONTAINER_NAME}
+ dockerImage = ""
+ dockerImage = ${?MARATHON_APP_DOCKER_IMAGE}
+ resourceCpu = ""
+ resourceCpu = ${?MARATHON_APP_RESOURCE_CPUS}
+ resourceMem = ""
+ resourceMem = ${?MARATHON_APP_RESOURCE_MEM}
+ labels = ""
+ labels = ${?MARATHON_APP_LABELS}
+ }
+}
+
+bugsnag {
+ apiKey = ""
+ apiKey = ${?BUGSNAG_KEY}
+ # Release stage used when reporting errors. Values are dev, staging, production
+ releaseStage = "dev"
+ releaseStage = ${?RELEASE_STAGE}
+}
+
+# Common settings for Akka
+
+akka {
+ loglevel = "WARNING"
+ loglevel = ${?AKKA_LOG_LEVEL}
+ stdout-loglevel = "WARNING"
+ stdout-loglevel = ${?AKKA_LOG_LEVEL}
+ loggers = ["akka.event.slf4j.Slf4jLogger"]
+ logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+
+ log-config-on-start = off
+ log-config-on-start = ${?AKKA_LOG_CONFIG}
+
+ log-dead-letters = 10
+ log-dead-letters-during-shutdown = off
+
+ coordinated-shutdown.terminate-actor-system = on
+
+ actor {
+ # provider = "cluster"
+
+ debug {
+ receive = on
+ autoreceive = off
+ lifecycle = on
+ fsm = off
+ unhandled = on
+ event-stream = off
+ }
+
+ serializers {
+ woken-messages-serializer = "ch.chuv.lren.woken.messages.AkkaSerializer"
+ }
+
+ serialization-bindings {
+ "ch.chuv.lren.woken.messages.Ping" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.Pong" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.ComponentQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.ComponentQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.VersionQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.VersionResponse" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.datasets.DatasetsQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.datasets.DatasetsResponse" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.datasets.TablesQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.datasets.TablesResponse" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.query.MethodsQuery$" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.query.MethodsResponse" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.query.MiningQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.query.ExperimentQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.query.QueryResult" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.validation.ValidationQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.validation.ValidationResult" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.validation.ScoringQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.validation.ScoringResult" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.variables.VariablesForDatasetsQuery" = woken-messages-serializer
+ "ch.chuv.lren.woken.messages.variables.VariablesForDatasetsResponse" = woken-messages-serializer
+ }
+
+ enable-additional-serialization-bindings = on
+ allow-java-serialization = off
+
+ }
+
+ remote {
+ log-sent-messages = on
+ log-received-messages = on
+ log-remote-lifecycle-events = on
+
+ watch-failure-detector {
+ acceptable-heartbeat-pause = 20 s
+ }
+
+ }
+
+ http {
+ server {
+ idle-timeout = 300s
+ request-timeout = 180s
+ ssl-encryption = off
+ ssl-tracing = on
+ }
+
+ client {
+ idle-timeout = 300s
+ request-timeout = 20 s
+ }
+
+ host-connection-pool {
+ max-connections = 128
+ max-open-requests = 128
+ }
+ }
+
+}
+
+remoting {
+
+ implementation = "artery"
+ # Alternative option is 'netty'
+ implementation = ${?AKKA_REMOTING}
+
+}
+
+clustering {
+ # IP address advertised by the Akka server
+ ip = "127.0.0.1"
+ ip = ${?CLUSTER_IP}
+ # Define the default Akka port for your app
+ port = 8088
+ port = ${?CLUSTER_PORT}
+
+ # Definition of the seed used to bootstrap the cluster
+ seed-ip = "127.0.0.1"
+ seed-ip = ${?CLUSTER_IP}
+ seed-ip = ${?WOKEN_PORT_8088_TCP_ADDR}
+ seed-port = 8088
+ seed-port = ${?WOKEN_PORT_8088_TCP_PORT}
+
+ # Name of the Akka cluster
+ cluster.name = "woken"
+ cluster.name = ${?CLUSTER_NAME}
+}
--
GitLab