Browse Source

fixed issue #162 , fixed IDE CanalLauncher

agapple 9 years ago
parent
commit
38cc81b7da

+ 7 - 1
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java

@@ -231,7 +231,13 @@ public class CanalController {
                         if (StringUtils.isEmpty(rootDir)) {
                         if (StringUtils.isEmpty(rootDir)) {
                             rootDir = "../conf";
                             rootDir = "../conf";
                         }
                         }
-                        monitor.setRootConf(rootDir);
+
+                        if (StringUtils.equals("otter-canal", System.getProperty("appName"))) {
+                            monitor.setRootConf(rootDir);
+                        } else {
+                            // eclipse debug模式
+                            monitor.setRootConf("src/main/resources/");
+                        }
                         return monitor;
                         return monitor;
                     } else if (mode.isManager()) {
                     } else if (mode.isManager()) {
                         return new ManagerInstanceConfigMonitor();
                         return new ManagerInstanceConfigMonitor();