From e2f5089a0aac40f7e0ef92e7c567d27db019b1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Bo=CC=88hm?= Date: Wed, 21 Feb 2018 17:51:37 +0100 Subject: [PATCH] don't do checks whether socket is available --- .../com/prisma/metrics/StatsdHostLookup.scala | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/server/libs/metrics/src/main/scala/com/prisma/metrics/StatsdHostLookup.scala b/server/libs/metrics/src/main/scala/com/prisma/metrics/StatsdHostLookup.scala index 345a1825ce..7214fbf9f8 100644 --- a/server/libs/metrics/src/main/scala/com/prisma/metrics/StatsdHostLookup.scala +++ b/server/libs/metrics/src/main/scala/com/prisma/metrics/StatsdHostLookup.scala @@ -1,6 +1,6 @@ package com.prisma.metrics -import java.net.{InetAddress, InetSocketAddress, Socket} +import java.net.{DatagramSocket, InetAddress, InetSocketAddress, Socket} import java.util.concurrent.Callable import scala.concurrent.Await @@ -25,14 +25,15 @@ case class StatsdHostLookup(dnsName: String, port: Int, reachableTimeout: Int) e resolveAndPutIntoCache() case Some(inetSocketAddr) => - val isReachable = doesServerListenOnSocketAddress(inetSocketAddr) - if (isReachable) { - log(s"isReachable: ${pretty(inetSocketAddr)}") - inetSocketAddr - } else { - log(s"socket address was not reachable anymore") - resolveAndPutIntoCache() - } +// val isReachable = doesServerListenOnSocketAddress(inetSocketAddr) +// if (isReachable) { +// log(s"isReachable: ${pretty(inetSocketAddr)}") +// inetSocketAddr +// } else { +// log(s"socket address was not reachable anymore") +// resolveAndPutIntoCache() +// } + inetSocketAddr } } @@ -46,22 +47,22 @@ case class StatsdHostLookup(dnsName: String, port: Int, reachableTimeout: Int) e def pretty(socketAddress: InetSocketAddress) = s"IP:${socketAddress.getAddress.getHostAddress} Port:${socketAddress.getPort}" - def doesServerListenOnSocketAddress(socketAddress: InetSocketAddress): Boolean = { - Try { - val socket = new Socket() - socket.connect(socketAddress, 500) - socket - } match { - case Success(socket) => - Try(socket.close()) - true - - case Failure(exception) => - log(s"failed with the following exception") - exception.printStackTrace() - false - } - } +// def doesServerListenOnSocketAddress(socketAddress: InetSocketAddress): Boolean = { +// Try { +// val socket = new DatagramSocket() +// socket.connect(socketAddress) +// socket +// } match { +// case Success(socket) => +// Try(socket.close()) +// true +// +// case Failure(exception) => +// log(s"failed with the following exception") +// exception.printStackTrace() +// false +// } +// } def log(msg: String): Unit = println(s"[${this.getClass.getSimpleName}] $msg") }