From b222c252e8e1fb7c4282182d4ad2b3314809f864 Mon Sep 17 00:00:00 2001
From: Toni Rikkola <toni@rikkola.net>
Date: Mon, 24 Aug 2015 11:30:45 +0300
Subject: [PATCH] Bug 1250349 - Exceptions are not logged in server.log file if
 not able to connect to kie-server

(cherry picked from commit 25064d52b95b7ec2edc02906d088f4625b080154)
---
 .../backend/ServerManagementServiceImpl.java  | 57 +++++++++++--------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-backend/src/main/java/org/kie/workbench/common/screens/server/management/backend/ServerManagementServiceImpl.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-backend/src/main/java/org/kie/workbench/common/screens/server/management/backend/ServerManagementServiceImpl.java
index aae5cf2e542..155a1dbb773 100644
--- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-backend/src/main/java/org/kie/workbench/common/screens/server/management/backend/ServerManagementServiceImpl.java
+++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-backend/src/main/java/org/kie/workbench/common/screens/server/management/backend/ServerManagementServiceImpl.java
@@ -28,12 +28,14 @@
 
 import org.guvnor.common.services.project.model.GAV;
 import org.jboss.errai.bus.server.annotations.Service;
+import org.kie.remote.common.rest.KieRemoteHttpRequestException;
 import org.kie.server.api.model.KieContainerResource;
 import org.kie.server.api.model.KieContainerStatus;
 import org.kie.server.api.model.KieScannerResource;
 import org.kie.server.api.model.KieScannerStatus;
 import org.kie.server.api.model.KieServerInfo;
 import org.kie.server.api.model.ReleaseId;
+import org.kie.server.client.KieServicesException;
 import org.kie.server.controller.api.KieServerControllerAdmin;
 import org.kie.server.controller.api.model.KieServerInstance;
 import org.kie.server.controller.api.model.KieServerInstanceInfo;
@@ -225,30 +227,39 @@ public void registerServer( final String endpoint,
         checkNotEmpty( "endpoint", endpoint );
         checkNotEmpty( "name", name );
 
-        final KieServerInfo kieServerInfo = new KieServerInfo();
-        kieServerInfo.setServerId(endpoint);
-        kieServerInfo.setName(name);
-        kieServerInfo.setVersion(version);
-
-        controllerAdmin.addKieServerInstance(kieServerInfo);
-
-        Server serverRef = new ServerImpl(
-                kieServerInfo.getServerId(),
-                "url",
-                kieServerInfo.getName(),
-                "user",
-                "password",
-                ContainerStatus.STOPPED,
-                ConnectionType.REMOTE,
-                null,
-                new HashMap<String, String>() {{
-                    put( "version", kieServerInfo.getVersion() );
-                }},
-                null
-        );
-
-        serverConnectedEvent.fire(new ServerConnected(serverRef));
+        try {
+
+            final KieServerInfo kieServerInfo = new KieServerInfo();
+            kieServerInfo.setServerId( endpoint );
+            kieServerInfo.setName( name );
+            kieServerInfo.setVersion( version );
+
+            controllerAdmin.addKieServerInstance( kieServerInfo );
+
+            Server serverRef = new ServerImpl(
+                    kieServerInfo.getServerId(),
+                    "url",
+                    kieServerInfo.getName(),
+                    "user",
+                    "password",
+                    ContainerStatus.STOPPED,
+                    ConnectionType.REMOTE,
+                    null,
+                    new HashMap<String, String>() {{
+                        put( "version", kieServerInfo.getVersion() );
+                    }},
+                    null
+            );
+
+            serverConnectedEvent.fire( new ServerConnected( serverRef ) );
 
+        } catch (KieServicesException e) {
+            logger.warn( "Connection failed", e );
+            throw e;
+        } catch (KieRemoteHttpRequestException e) {
+            logger.warn( "Connection failed", e );
+            throw e;
+        }
     }
 
     private KieContainerResource findContainerById(String containerId, Set<KieContainerResource> containerResources) {