Refactoring for #1182

MAIF · Jul 6, 2022 · ffaf38d · ffaf38d
1 parent 0bcf87a
commit ffaf38d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/otoroshi/app/cluster/cluster.scala b/otoroshi/app/cluster/cluster.scala
@@ -185,6 +185,7 @@ case class RegionalLocation(
   datacenter: String,
   rack: String
 ) {
+  def desc: String = s"provider: '${provider}', region: '${region}', zone: '${zone}', datacenter: '${datacenter}', rack: ${rack}"
   def json: JsValue = Json.obj(
     "provider" -> provider,
     "zone" -> zone,
@@ -1761,6 +1762,7 @@ class ClusterAgent(config: ClusterConfig, env: Env) {
     if (env.clusterConfig.regionalRouting.enabled) {
       Cluster.logger.warn("regional routing is enabled !")
       Cluster.logger.warn("be aware that this feature is EXPERIMENTAL and might not work as expected.")
+      Cluster.logger.info(s"this instance is located at: ${env.clusterConfig.regionalRouting.location.desc}")
     }
   }
 

diff --git a/otoroshi/app/next/proxy/zones.scala b/otoroshi/app/next/proxy/zones.scala
@@ -97,7 +97,7 @@ case class SelectedLeader(member: MemberView, route: NgRoute, counter: AtomicInt
     }
     val uriStr = s"$url/api/cluster/relay"
     val uri = Uri(uriStr)
-    env.Ws.urlWithTarget(uriStr, Target(
+    env.Ws.akkaUrlWithTarget(uriStr, Target(
       host  = uri.authority.toString(),
       scheme = uri.scheme,
       protocol = HttpProtocols.`HTTP/1.1`,