From a3620167d1cbd71d68fa05c363a3e308aaf47a2a Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Sat, 12 Oct 2019 15:44:58 +0800
Subject: [PATCH] signOut error update and install.sh echo error update (#999)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources

* checkQueueNameExist method update

* checkQueueExist

* install.sh error output update

* signOut error update
---
 .../api/service/SessionService.java              | 16 ++++++++++------
 install.sh                                       |  2 +-
 2 files changed, 11 insertions(+), 7 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 b33950c16..de1a8bd36 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
@@ -137,12 +137,16 @@ public class SessionService extends BaseService{
    * @param loginUser
    */
   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){
+
+    }
   }
 }
diff --git a/install.sh b/install.sh
index 9f9334fd3..ab995841b 100644
--- a/install.sh
+++ b/install.sh
@@ -464,7 +464,7 @@ if [ $? -eq 0 ]
 then
 	echo 'scp copy completed'
 else
-	echo 'sc copy failed to exit'
+	echo 'scp copy failed to exit'
 	exit -1
 fi
 
-- 
GitLab