From 24ec6985c095120a9f0db7bdfbaed25b74c4b57c Mon Sep 17 00:00:00 2001 From: youbowu Date: Fri, 10 Mar 2017 15:38:37 +0800 Subject: Add log for debugger Issue-ID: HOLMES-50 Change-Id: I9761d207cb6d55378592021e42c9398e6343040f Signed-off-by: youbowu --- .../holmes/rulemgt/bolt/enginebolt/EngineService.java | 3 +++ .../holmes/rulemgt/bolt/enginebolt/EngineWrapper.java | 18 +++++++++++++----- .../rulemgt/bolt/enginebolt/EngineWrapperTest.java | 17 ----------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java index 1a1aa83..72e9a66 100644 --- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java +++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineService.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -38,6 +39,7 @@ import org.openo.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine; import org.openo.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine; import org.openo.holmes.rulemgt.constant.RuleMgtConstant; +@Slf4j @Service public class EngineService { @@ -62,6 +64,7 @@ public class EngineService { CloseableHttpClient httpClient = HttpClients.createDefault(); try { HttpPost httpPost = new HttpPost(url); + log.info("url:" + url + "," + "post:" + httpPost); setHeader(httpPost); if (StringUtils.isNotEmpty(content)) { httpPost.setEntity(new ByteArrayEntity(content.getBytes())); diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java index beecdd3..c351bbb 100644 --- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java +++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java @@ -15,10 +15,12 @@ */ package org.openo.holmes.rulemgt.bolt.enginebolt; +import java.io.IOException; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONObject; import org.apache.http.HttpResponse; +import org.apache.http.util.EntityUtils; import org.jvnet.hk2.annotations.Service; import org.openo.holmes.common.exception.CorrelationException; import org.openo.holmes.common.utils.I18nProxy; @@ -38,7 +40,7 @@ public class EngineWrapper { try { httpResponse = engineService.deploy(correlationRule); } catch (Exception e) { - throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_DEPLOY_RULE_REST_FAILED,e); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_DEPLOY_RULE_REST_FAILED, e); } if (httpResponse.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) { log.info("Call deploy rule rest interface in engine successfully."); @@ -47,7 +49,7 @@ public class EngineWrapper { JSONObject json = JSONObject.fromObject(content); return json.get(RuleMgtConstant.PACKAGE).toString(); } catch (Exception e) { - throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_PARSE_DEPLOY_RESULT_ERROR,e); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_PARSE_DEPLOY_RESULT_ERROR, e); } } else { throw new CorrelationException(I18nProxy.ENGINE_DEPLOY_RULE_FAILED); @@ -59,7 +61,7 @@ public class EngineWrapper { try { httpResponse = engineService.delete(packageName); } catch (Exception e) { - throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_DELETE_RULE_REST_FAILED,e); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_DELETE_RULE_REST_FAILED, e); } if (httpResponse.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) { log.info("Call delete rule rest interface in engine successfully."); @@ -75,13 +77,19 @@ public class EngineWrapper { try { httpResponse = engineService.check(correlationCheckRule4Engine); } catch (Exception e) { - throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_CHECK_RULE_REST_FAILED,e); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CALL_CHECK_RULE_REST_FAILED, e); } if (httpResponse.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) { log.info("Call check rule rest interface in engine successfully."); return true; } else { - throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CHECK_NO_PASS); + try { + log.info(httpResponse.getStatusLine().getStatusCode() + "," + EntityUtils + .toString(httpResponse.getEntity())); + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CHECK_NO_PASS); + } catch (IOException e) { + throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CHECK_NO_PASS); + } } } } diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java index 8d25d6a..7746394 100644 --- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java +++ b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java @@ -178,23 +178,6 @@ public class EngineWrapperTest { PowerMock.verifyAll(); } - @Test - public void checkRuleFromEngine_http_status_not_200() throws Exception { - thrown.expect(CorrelationException.class); - thrown.expectMessage(I18nProxy.RULE_MANAGEMENT_CHECK_NO_PASS); - - EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class))) - .andReturn(httpResponseMock); - EasyMock.expect(httpResponseMock.getStatusLine()).andReturn(statusLineMock); - EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400); - - PowerMock.replayAll(); - - engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine()); - - PowerMock.verifyAll(); - } - @Test public void checkRuleFromEngine_success() throws Exception { EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class))) -- cgit 1.2.3-korg