|
|
@@ -24,8 +24,7 @@ import java.util.concurrent.ExecutorService; |
|
|
|
import java.util.concurrent.Future; |
|
|
|
|
|
|
|
import static bubble.model.device.FlexRouterPing.MAX_PING_AGE; |
|
|
|
import static bubble.service.device.FlexRouterTunnel.startFlexTunnel; |
|
|
|
import static bubble.service.device.FlexRouterTunnel.stopFlexTunnel; |
|
|
|
import static bubble.service.device.FlexRouterTunnel.*; |
|
|
|
import static java.util.concurrent.TimeUnit.MINUTES; |
|
|
|
import static java.util.concurrent.TimeUnit.SECONDS; |
|
|
|
import static org.cobbzilla.util.daemon.Await.awaitAll; |
|
|
@@ -109,7 +108,7 @@ public class StandardFlexRouterService extends SimpleDaemon implements FlexRoute |
|
|
|
} |
|
|
|
|
|
|
|
public static boolean pingFlexRouter(FlexRouter router, FlexRouterDAO flexRouterDAO, HttpClient httpClient) { |
|
|
|
final String pingUrl = router.pingUrl(); |
|
|
|
final String pingUrl = tunnelPingUrl(router); |
|
|
|
final HttpRequestBean request = new HttpRequestBean(POST, pingUrl); |
|
|
|
final String prefix = "pingRouter(" + router + "): "; |
|
|
|
for (int i=0; i<MAX_PING_TRIES; i++) { |
|
|
|