From 15bfbc0355dc41125ad22201b107ebf8444f06ab Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 5 Jan 2016 10:36:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E5=BC=82=E5=B8=B8=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=202.=E5=9C=A8conf=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E8=80=8C?= =?UTF-8?q?=E9=9D=9E=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=BC=80=E6=94=BE=E6=83=85=E5=86=B5=E3=80=82?= =?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=86=85=E5=AE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buriedpoint/LocalBuriedPointSender.java | 2 -- .../com/ai/cloud/skywalking/conf/Config.java | 2 ++ .../cloud/skywalking/conf/ConfigInitializer.java | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java index ff56e71d4..8e5c0b528 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java @@ -52,6 +52,4 @@ public class LocalBuriedPointSender extends ApplicationExceptionHandler implemen ContextBuffer.save(spanData); } } - - public void handleException(Throwable e) {} } diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java index 9bac53235..199b35d3a 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java @@ -8,6 +8,8 @@ public class Config { public static String APPLICATION_CODE = ""; public static String AUTH_SYSTEM_ENV_NAME = "SKYWALKING_RUN"; + + public static boolean AUTH_OVERRIDE = false; } public static class BuriedPoint { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java index cbf673050..116cb1645 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java @@ -9,24 +9,30 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import static com.ai.cloud.skywalking.conf.Config.SkyWalking.*; + public class ConfigInitializer { private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName()); public static void initialize() { InputStream inputStream = ConfigInitializer.class.getResourceAsStream("/sky-walking.auth"); if (inputStream == null) { - logger.log(Level.ALL, "No provider sky-walking certification documents, buried point won't work"); + logger.log(Level.ALL, "No provider sky-walking certification documents, sky-walking api auto shutdown."); } else { try { Properties properties = new Properties(); properties.load(inputStream); initNextLevel(properties, Config.class, new ConfigDesc()); - AuthDesc.isAuth = Boolean.valueOf(System.getenv(Config.SkyWalking.AUTH_SYSTEM_ENV_NAME)); - logger.log(Level.ALL, "skywalking auth check : " + AuthDesc.isAuth); + AuthDesc.isAuth = Boolean.valueOf(System.getenv(AUTH_SYSTEM_ENV_NAME)); + logger.log(Level.ALL, "sky-walking auth check : " + AuthDesc.isAuth); + if(!AuthDesc.isAuth && AUTH_OVERRIDE){ + AuthDesc.isAuth = AUTH_OVERRIDE; + logger.log(Level.ALL, "sky-walking auth override: " + AuthDesc.isAuth); + } } catch (IllegalAccessException e) { - logger.log(Level.ALL, "Parsing certification file failed, buried won't work"); + logger.log(Level.ALL, "Parsing certification file failed, sky-walking api auto shutdown."); } catch (IOException e) { - logger.log(Level.ALL, "Failed to read the certification file, buried won't work"); + logger.log(Level.ALL, "Failed to read the certification file, sky-walking api auto shutdown."); } } }