From e6ebf62a1fa8a508fe88e17a1339be53cb47f94d Mon Sep 17 00:00:00 2001
From: Alan Lau <liuweiyi@cmss.chinamobile.com>
Date: Mon, 6 May 2019 15:17:20 +0800
Subject: [PATCH] Add catch clause more details. (#2601)

* Add catch clause more details.

* Update SkyWalkingAgent.java
---
 .../org/apache/skywalking/apm/agent/SkyWalkingAgent.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
index 033b831ba..6ef21ec9d 100644
--- a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
+++ b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
@@ -27,8 +27,10 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
 import net.bytebuddy.utility.JavaModule;
+import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException;
 import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
 import org.apache.skywalking.apm.agent.core.conf.Config;
+import org.apache.skywalking.apm.agent.core.conf.ConfigNotFoundException;
 import org.apache.skywalking.apm.agent.core.conf.SnifferConfigInitializer;
 import org.apache.skywalking.apm.agent.core.logging.api.ILog;
 import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
@@ -61,6 +63,12 @@ public class SkyWalkingAgent {
 
             pluginFinder = new PluginFinder(new PluginBootstrap().loadPlugins());
 
+        } catch (ConfigNotFoundException ce) {
+            logger.error(ce, "Skywalking agent could not find config. Shutting down.");
+            return;
+        } catch (AgentPackageNotFoundException ape) {
+            logger.error(ape, "Locate agent.jar failure. Shutting down.");
+            return;
         } catch (Exception e) {
             logger.error(e, "Skywalking agent initialized failure. Shutting down.");
             return;