Merge branch 'develop' of https://github.com/vipshop/Saturn into develop

vipshop · Jun 8, 2017 · 31cb3c2 · 31cb3c2
2 parents 7d6b7fa + ec6bd43
commit 31cb3c2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/saturn-console/src/main/resources/templates/job_detail.html b/saturn-console/src/main/resources/templates/job_detail.html
@@ -101,7 +101,7 @@ <h3 class="pull-left panel-title">基本配置</h3>
 
 							                    <label for="jobDegree" class="col-sm-1 control-label">作业重要等级</label>
 							                    <div class="col-sm-2">
-													<select id="jobDegree" class="selectpicker form-control">
+													<select id="jobDegree" class="form-control">
 														<option selected="selected" value="0" title="0:没有定义">0:没有定义</option>
 														<option value="1" title="1:非线上业务">1:非线上业务</option>
 														<option value="2" title="2:简单业务">2:简单业务</option>

diff --git a/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java b/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java
@@ -1,24 +1,5 @@
 package com.vip.saturn.job.executor;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.state.ConnectionState;
-import org.apache.curator.framework.state.ConnectionStateListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Strings;
 import com.vip.saturn.job.basic.JobRegistry;
 import com.vip.saturn.job.basic.JobScheduler;
@@ -38,6 +19,24 @@
 import com.vip.saturn.job.utils.StartCheckUtil;
 import com.vip.saturn.job.utils.StartCheckUtil.StartCheckItem;
 import com.vip.saturn.job.utils.SystemEnvProperties;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.state.ConnectionState;
+import org.apache.curator.framework.state.ConnectionStateListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class SaturnExecutor {
 
@@ -417,6 +416,8 @@ public void run() {
 			};
 			ShutdownHandler.addShutdownCallback(shutdownHandler);
 		}
+
+		log.info("executor start up successfully");
 	}
 
 	private void shutdownAllCountThread() {