Просмотр исходного кода

修改 JmsListener 的 start 和 stop 方法的返回值

sunyj 8 лет назад
Родитель
Сommit
7bc79e9ef7

+ 6 - 3
src/main/java/com/uas/search/controller/IndexController.java

@@ -69,13 +69,15 @@ public class IndexController {
 	@RequestMapping("/listen/start")
 	@ResponseBody
 	public String startListen(Long period, HttpServletRequest request) {
-		return jmsListener.start(period);
+		jmsListener.start(period);
+        return "开启成功";
 	}
 
 	@RequestMapping("/listen/stop")
 	@ResponseBody
 	public String stopListen(HttpServletRequest request) {
-		return jmsListener.stop();
+		jmsListener.stop();
+        return "关闭成功";
 	}
 
 	@RequestMapping("/listen/restart")
@@ -84,7 +86,8 @@ public class IndexController {
 		if (jmsListener.isRunning()) {
 			jmsListener.stop();
 		}
-		return jmsListener.start(period);
+		jmsListener.start(period);
+        return "重启成功";
 	}
 
 	@RequestMapping("/listen/details")

+ 5 - 16
src/main/java/com/uas/search/jms/JmsListener.java

@@ -57,7 +57,7 @@ public class JmsListener {
      *            每次接收到jms消息后等待的时间(秒)
      * @return 开启成功与否的提示信息
      */
-    public String start(Long period) {
+    public void start(Long period) {
         if(period == null){
             period = PERIOD;
         }else{
@@ -67,11 +67,8 @@ public class JmsListener {
             throw new IllegalArgumentException("period 不合法:" + period);
         }
 
-        String message = "";
         if (isRunning()) {
-            message = "已存在运行的索引实时更新服务";
-            logger.warn(message);
-            return message;
+            throw new IllegalStateException("已存在运行的索引实时更新服务");
         }
 
         try {
@@ -104,16 +101,12 @@ public class JmsListener {
                 taskService.stop();
             }
             taskService.start();
-            message = "索引实时更新服务成功开启";
-            logger.info(message);
         } catch (Throwable e) {
-            message = "索引实时更新服务开启失败";
-            logger.error(message, e);
             if (taskInformation != null) {
                 taskInformation = null;
             }
+            throw new IllegalStateException("开启失败", e);
         }
-        return message;
     }
 
     /**
@@ -121,11 +114,9 @@ public class JmsListener {
      *
      * @return 关闭成功与否的提示信息
      */
-    public String stop() {
-        String message = "";
+    public void stop() {
         if (!isRunning()) {
-            message = "索引实时更新服务未开启或已关闭";
-            logger.warn(message);
+            throw new IllegalStateException("索引实时更新服务未开启或已关闭");
         } else {
             taskService.remove(taskInformation.getCode());
             taskInformation = null;
@@ -133,9 +124,7 @@ public class JmsListener {
                 taskService.stop();
             }
             taskService.start();
-            message = "索引实时更新服务成功关闭";
         }
-        return message;
     }
 
     /**