Commit 8125974c authored by Yelli's avatar Yelli Committed by Tboy
Browse files

ds.server regularize log print (#1751) 

* ds.server regularize log print

* log print modify

* log print modify

* modify lang3 to lang
parent 8ae401e3

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/SecurityConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */

package org.apache.dolphinscheduler.api.security;



import org.apache.commons.lang3.StringUtils;

import org.apache.commons.lang.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java

+3 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class MasterServer implements IStoppable { 
            } catch (SchedulerException e1) {

                logger.error("QuartzExecutors shutdown failed : " + e1.getMessage(), e1);

            }

            logger.error("start Quartz failed : " + e.getMessage(), e);

            logger.error("start Quartz failed", e);

        }
@@ -183,7 +183,7 @@ public class MasterServer implements IStoppable { 
                //thread sleep 3 seconds for thread quitely stop

                Thread.sleep(3000L);

            }catch (Exception e){

                logger.warn("thread sleep exception:" + e.getMessage(), e);

                logger.warn("thread sleep exception ", e);

            }

            try {

                heartbeatMasterService.shutdownNow();
@@ -228,7 +228,7 @@ public class MasterServer implements IStoppable { 




        } catch (Exception e) {

            logger.error("master server stop exception : " + e.getMessage(), e);

            logger.error("master server stop exception ", e);

            System.exit(-1);

        }

    }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> { 
                }

                Thread.sleep(commitRetryInterval);

            } catch (Exception e) {

                logger.error("task commit to mysql and queue failed : " + e.getMessage(),e);

                logger.error("task commit to mysql and queue failed",e);

            }

            retryTimes += 1;

        }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

+4 −4
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class MasterExecThread implements Runnable { 
                executeProcess();

            }

        }catch (Exception e){

            logger.error("master exec thread exception: " + e.getMessage(), e);

            logger.error("master exec thread exception", e);

            logger.error("process execute failed, process id:{}", processInstance.getId());

            processInstance.setState(ExecutionStatus.FAILURE);

            processInstance.setEndTime(new Date());
@@ -355,7 +355,7 @@ public class MasterExecThread implements Runnable { 
            try {

                FileUtils.deleteDirectory(new File(execLocalPath));

            } catch (IOException e) {

                logger.error("delete exec dir failed : " + e.getMessage(), e);

                logger.error("delete exec dir failed ", e);

            }

        }

    }
@@ -733,7 +733,7 @@ public class MasterExecThread implements Runnable { 
            Date endTime = DateUtils.getScheduleDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));

            return processInstance.getScheduleTime().equals(endTime);

        } catch (Exception e) {

            logger.error("complement end failed : " + e.getMessage(),e);

            logger.error("complement end failed ",e);

            return false;

        }

    }
@@ -1005,7 +1005,7 @@ public class MasterExecThread implements Runnable { 
                return task;

            }

        }catch (Exception e){

            logger.error("get recovery task instance failed : " + e.getMessage(),e);

            logger.error("get recovery task instance failed ",e);

        }

        return null;

    }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class MasterSchedulerThread implements Runnable { 
                    }

                }

            }catch (Exception e){

                logger.error("master scheduler thread exception : " + e.getMessage(),e);

                logger.error("master scheduler thread exception",e);

            }finally{

                AbstractZKClient.releaseMutex(mutex);

            }