From bbef3ed82ca4faee5b19ba820dae11e86054b291 Mon Sep 17 00:00:00 2001 From: “shentao” Date: Wed, 9 Nov 2016 18:48:07 +0800 Subject: GSO-104 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaea5ab5d93cbaf6d7c18bd93823695768f59f897 Signed-off-by: “shentao” --- openo-portal/portal-package/pom.xml | 22 +++++ .../org/openo/portal/system/RegisterService.java | 20 ++-- .../org/openo/portal/system/SystemListener.java | 11 ++- .../portal-package/src/main/resources/logback.xml | 102 +++++++++++++++++++++ 4 files changed, 143 insertions(+), 12 deletions(-) create mode 100644 openo-portal/portal-package/src/main/resources/logback.xml (limited to 'openo-portal/portal-package') diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml index baf14fb9..ac309936 100644 --- a/openo-portal/portal-package/pom.xml +++ b/openo-portal/portal-package/pom.xml @@ -28,9 +28,31 @@ openoui + 1.1.2 + 1.7.6 + + ch.qos.logback + logback-core + ${version.logback} + + + ch.qos.logback + logback-classic + ${version.logback} + + + ch.qos.logback + logback-access + ${version.logback} + + + org.slf4j + slf4j-api + ${version.slf4j} + javax.servlet servlet-api diff --git a/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java index 01ba3526..a1a06f0a 100644 --- a/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/RegisterService.java @@ -34,9 +34,13 @@ import org.dom4j.Element; import org.dom4j.io.SAXReader; import org.openo.portal.bean.MsbRegisterBean; import org.openo.portal.bean.ServiceNodeBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RegisterService { + private final static Logger logger = LoggerFactory.getLogger(RegisterService.class); + public static HashMap msbHostMap = new HashMap(); public static List> registerList = new ArrayList>(); @@ -70,13 +74,12 @@ public class RegisterService { registerBean.setLb_policy(registerInfo.get("lb_policy")); JSONObject registerObj = JSONObject.fromObject(registerBean); - String registerResponse = registerPortalService(url, registerObj, ""); - // TODO - System.out.println(registerResponse); + String registerResponse = registerPortalService(registerBean.getServiceName(), url, registerObj, ""); } + logger.info("open-o portal register task succeeded."); } catch (Exception e){ - // TODO - e.printStackTrace(); + logger.error("open-o portal register task failed."); + logger.error(e.getMessage()); } } @@ -107,7 +110,7 @@ public class RegisterService { } } - private static String registerPortalService(String url, JSONObject json, String token) { + private static String registerPortalService(String serviceName, String url, JSONObject json, String token) { DefaultHttpClient client = new DefaultHttpClient(); HttpPost post = new HttpPost(url); String response = null; @@ -132,9 +135,10 @@ public class RegisterService { response = null; } } + logger.info("register task [" + serviceName + "] completed successfully."); } catch (Exception e) { - // TODO - e.printStackTrace();; + logger.error("register task [" + serviceName + "] failed because of errors."); + logger.error(e.getMessage()); } return response; diff --git a/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java b/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java index 05447232..eadb77a1 100644 --- a/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java +++ b/openo-portal/portal-package/src/main/java/org/openo/portal/system/SystemListener.java @@ -20,17 +20,20 @@ import java.io.File; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class SystemListener implements ServletContextListener { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + public void contextDestroyed(ServletContextEvent sce) { } public void contextInitialized(ServletContextEvent servletContextEvent) { - // TODO - System.out.println("portal register task begin"); + logger.info("open-o portal register task begin."); String registerFilePath = SystemListener.class.getClassLoader().getResource("").getPath() + "portalConfig" + File.separator + "msb_register.xml"; RegisterService.registerMsb(registerFilePath); - // TODO - System.out.println("portal register task ended."); + logger.info("open-o portal register task ended."); } } diff --git a/openo-portal/portal-package/src/main/resources/logback.xml b/openo-portal/portal-package/src/main/resources/logback.xml new file mode 100644 index 00000000..bf07d3b2 --- /dev/null +++ b/openo-portal/portal-package/src/main/resources/logback.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + + ERROR + ACCEPT + DENY + + + ${logDir}/error/error.%d{yyyy-MM}.log + ${maxHistory} + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + + WARN + ACCEPT + DENY + + + ${logDir}/warn/warn.%d{yyyy-MM}.log + ${maxHistory} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + INFO + ACCEPT + DENY + + + ${logDir}/info/info.%d{yyyy-MM}.log + ${maxHistory} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + DEBUG + ACCEPT + DENY + + + ${logDir}/debug/debug.%d{yyyy-MM}.log + ${maxHistory} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + TRACE + ACCEPT + DENY + + + ${logDir}/trace/trace.%d{yyyy-MM}.log + ${maxHistory} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + + + + + + + + -- cgit 1.2.3-korg