This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch multiple-cloud in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/multiple-cloud by this push: new 8ff62b1 Make restore handler request after starting of self-service 8ff62b1 is described below commit 8ff62b17d9c294d147fe512942b326c42714c5fd Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Fri Jan 10 18:27:46 2020 +0200 Make restore handler request after starting of self-service --- .../java/com/epam/dlab/backendapi/SelfServiceApplication.java | 3 ++- .../dropwizard/listeners/RestoreHandlerStartupListener.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java index 0fe8464..6a12ea5 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java @@ -30,6 +30,7 @@ import com.epam.dlab.backendapi.modules.ModuleFactory; import com.epam.dlab.backendapi.resources.*; import com.epam.dlab.backendapi.resources.callback.*; import com.epam.dlab.backendapi.schedulers.internal.ManagedScheduler; +import com.epam.dlab.backendapi.service.EndpointService; import com.epam.dlab.backendapi.servlet.guacamole.GuacamoleServlet; import com.epam.dlab.cloud.CloudModule; import com.epam.dlab.constants.ServiceConsts; @@ -105,7 +106,7 @@ public class SelfServiceApplication extends Application<SelfServiceApplicationCo environment.lifecycle().addServerLifecycleListener(injector.getInstance(MongoStartupListener.class)); final RestoreHandlerStartupListener restoreHandlerStartupListener = new RestoreHandlerStartupListener(injector.getInstance(Key.get(RESTService.class, - Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME)))); + Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME))), injector.getInstance(EndpointService.class)); environment.lifecycle().addServerLifecycleListener(restoreHandlerStartupListener); environment.lifecycle().addServerLifecycleListener(this::disableGzipHandlerForGuacamoleServlet); environment.lifecycle().manage(injector.getInstance(IndexCreator.class)); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/RestoreHandlerStartupListener.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/RestoreHandlerStartupListener.java index 73f5961..0de166c 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/RestoreHandlerStartupListener.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/RestoreHandlerStartupListener.java @@ -19,24 +19,30 @@ package com.epam.dlab.backendapi.dropwizard.listeners; +import com.epam.dlab.backendapi.domain.EndpointDTO; +import com.epam.dlab.backendapi.service.EndpointService; import com.epam.dlab.rest.client.RESTService; import io.dropwizard.lifecycle.ServerLifecycleListener; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.server.Server; @Slf4j public class RestoreHandlerStartupListener implements ServerLifecycleListener { private final RESTService provisioningService; + private final EndpointService endpointService; - public RestoreHandlerStartupListener(RESTService provisioningService) { + public RestoreHandlerStartupListener(RESTService provisioningService, EndpointService endpointService) { this.provisioningService = provisioningService; + this.endpointService = endpointService; } @Override public void serverStarted(Server server) { try { - provisioningService.post("/handler/restore", new Object(), Object.class); + endpointService.getEndpointsWithStatus(EndpointDTO.EndpointStatus.ACTIVE) + .forEach(e -> provisioningService.post(e.getUrl() + "/handler/restore", StringUtils.EMPTY, Object.class)); } catch (Exception e) { log.error("Exception occurred during restore handler request: {}", e.getMessage()); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org