Browse Source

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
pull/2/head
qiaozhanwei 5 years ago committed by lgcareer
parent
commit
a3620167d1
  1. 16
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java
  2. 2
      install.sh

16
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java

@ -137,12 +137,16 @@ public class SessionService extends BaseService{
* @param loginUser * @param loginUser
*/ */
public void signOut(String ip, User loginUser) { public void signOut(String ip, User loginUser) {
/** try {
* query session by user id and ip /**
*/ * query session by user id and ip
Session session = sessionMapper.queryByUserIdAndIp(loginUser.getId(),ip); */
Session session = sessionMapper.queryByUserIdAndIp(loginUser.getId(),ip);
//delete session //delete session
sessionMapper.deleteById(session.getId()); sessionMapper.deleteById(session.getId());
}catch (Exception e){
}
} }
} }

2
install.sh

@ -464,7 +464,7 @@ if [ $? -eq 0 ]
then then
echo 'scp copy completed' echo 'scp copy completed'
else else
echo 'sc copy failed to exit' echo 'scp copy failed to exit'
exit -1 exit -1
fi fi

Loading…
Cancel
Save