Skip to content
Snippets Groups Projects
Commit dbea5d2c authored by Ludovic Claude's avatar Ludovic Claude
Browse files

Update woken-messages to 3.0.3, remove old akka conf

parent dd8e2b0c
No related branches found
No related tags found
No related merge requests found
......@@ -47,9 +47,9 @@
<spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
<spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
<aspectjweaver.version>1.8.9</aspectjweaver.version>
<woken-messages.version>3.0.2</woken-messages.version>
<woken-messages.version>3.0.3</woken-messages.version>
<javax-inject.version>1</javax-inject.version>
<akka.version>2.5.21</akka.version>
<akka.version>2.5.22</akka.version>
<spring-context.version>4.3.4.RELEASE</spring-context.version>
<protobuf-java.version>3.1.0</protobuf-java.version>
......
akka {
remote {
netty.tcp {
enabled = off
}
artery {
enabled = on
transport = tcp
canonical.hostname = ${clustering.ip} # external (logical) hostname
canonical.port = ${clustering.port} # external (logical) port
bind.hostname = 0.0.0.0 # internal (bind) hostname
bind.port = ${clustering.port} # internal (bind) port
}
}
}
remoting {
protocol = "akka"
}
akka {
remote {
maximum-payload-bytes = 30000000 bytes
netty.tcp {
hostname = ${clustering.ip} # external (logical) hostname
port = ${clustering.port} # external (logical) port
bind-hostname = 0.0.0.0 # internal (bind) hostname
bind-port = ${clustering.port} # internal (bind) port
message-frame-size = 30000000b
send-buffer-size = 30000000b
receive-buffer-size = 30000000b
maximum-frame-size = 30000000b
}
artery {
enabled = off
}
}
}
remoting {
protocol = "akka.tcp"
}
remoting {
implementation = "netty"
# Alternative option is 'artery'
implementation = ${?AKKA_REMOTING}
}
......@@ -13,6 +13,8 @@ akka {
log-dead-letters = 10
log-dead-letters-during-shutdown = off
coordinated-shutdown.terminate-actor-system = on
actor {
# provider = "cluster"
......@@ -37,6 +39,8 @@ akka {
${remoting.protocol}"://"${clustering.cluster.name}"@"${clustering.seed-ip}":"${clustering.seed-port}
]
shutdown-after-unsuccessful-join-seed-nodes = 20s
roles = ["portal"]
}
......
......@@ -3,7 +3,8 @@ kamon {
enabled = ${?KAMON_ENABLED}
environment {
service = "woken"
service = "portal-backend"
service = ${?KAMON_SERVICE_NAME}
}
zipkin = {
......@@ -35,6 +36,14 @@ kamon {
"akka.traced-actor" {
includes = ["**"]
excludes = [
${clustering.cluster.name}"/system/IO**",
${clustering.cluster.name}"/user/Stream**",
${clustering.cluster.name}"/system/transports**",
${clustering.cluster.name}"/system/cluster**",
${clustering.cluster.name}"/system/remote**",
${clustering.cluster.name}"/system/endpointmanager/**",
${clustering.cluster.name}"/system/sharding/UserActor/**"]
}
}
......@@ -49,6 +58,7 @@ kamon {
trace {
join-remote-parents-with-same-span-id = yes
sampler = "always"
}
system-metrics {
......
......@@ -3,17 +3,17 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout
pattern="%d{HH:mm:ss.SSS} %highlight{%level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue} %logger{36} - %msg%n"/>
pattern="%d{HH:mm:ss.SSS} %highlight{%level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue} %logger{36} - %.1000msg%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="DEBUG">
<Root level="${env:LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Root>
<Logger name="akka.actor.LocalActorRefProvider(akka://woken)" level="INFO">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.cluster" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<Logger name="akka.cluster" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.io" level="INFO">
......@@ -22,10 +22,10 @@
<Logger name="akka.http.impl" level="INFO">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.remote.artery.compress" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<Logger name="akka.remote.artery.compress" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.remote.artery.tcp" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<Logger name="akka.remote.artery.tcp" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.stream.impl" level="INFO">
......
app {
# Name of the application
name = "Portal backend"
# Type of the application
type = "Spring"
clusterSystemName = ${clustering.cluster.name}
}
......
......@@ -43,7 +43,7 @@ services:
- db
meta_db_setup:
image: "hbpmip/sample-meta-db-setup:0.6.0"
image: "hbpmip/sample-meta-db-setup:0.7.1"
container_name: "meta-db-setup"
restart: "no"
networks:
......@@ -59,7 +59,7 @@ services:
- db
sample_db_setup:
image: "hbpmip/sample-data-db-setup:0.6.2"
image: "hbpmip/sample-data-db-setup:0.7.0"
container_name: "data-db-setup"
restart: "no"
networks:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment