From 53814425b7c40a2912385059a0c8fe33102c2922 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Thu, 16 Jan 2020 15:09:13 +0800
Subject: [PATCH] revert #1686 (#1840)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify，start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove

* AlertMappert UT modify

* AlertMappert UT modify

* AlertMappert UT modify

* CommandMapperTest UT modify

* DataSourceMapperTest UT modify

* fix #1775 bug，delete process definition when process instance is running

* verifyTenantIsNull remove process definnition id print log

* revert #1686

* revert #1686
---
 .../api/service/SessionService.java              | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java
index f3f66d730..2588dd0e6 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java
@@ -139,12 +139,16 @@ public class SessionService extends BaseService{
    * @param loginUser login user
    */
   public void signOut(String ip, User loginUser) {
-      /**
-       * query session by user id and ip
-       */
-      Session session = sessionMapper.queryByUserIdAndIp(loginUser.getId(),ip);
+    try {
+        /**
+         * query session by user id and ip
+         */
+        Session session = sessionMapper.queryByUserIdAndIp(loginUser.getId(),ip);
 
-      //delete session
-      sessionMapper.deleteById(session.getId());
+        //delete session
+        sessionMapper.deleteById(session.getId());
+    }catch (Exception e){
+        logger.warn("userId : {} , ip : {} , find more one session",loginUser.getId(),ip);
+    }
   }
 }
-- 
GitLab