Unverified Commit ec13974e authored by samz406's avatar samz406 Committed by GitHub
Browse files

Merge pull request #27 from apache/dev 

update
parents a1fe80ea be4fa728

.github/workflows/ci_ut.yml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# limitations under the License.

#



on: [push, "pull_request"]

on: ["push", "pull_request"]

env:

  DOCKER_DIR: ./docker

  LOG_DIR: /tmp/dolphinscheduler
@@ -47,7 +47,7 @@ jobs: 
      - name: Compile

        run: |

          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'

          mvn test -Dmaven.test.skip=false cobertura:cobertura

          mvn test -B -Dmaven.test.skip=false cobertura:cobertura

          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)

      - name: Run SonarCloud Analysis

        run: >

README.md

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ It is because of the shoulders of these open source projects that the birth of t 


### Get Help

1. Submit an issue

1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/user_doc/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org

1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org

1. Contact WeChat group manager, ID 510570367. This is for Mandarin(CN) discussion.



### License

dockerfile/conf/dolphinscheduler/conf/common/common.properties

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM 
login.user.keytab.path=/opt/hdfs.headless.keytab



# system env path. self configuration, please make sure the directory and file exists and have read write execute permissions

dolphinscheduler.env.path=/opt/dolphinscheduler/conf/env/.dolphinscheduler_env.sh

dolphinscheduler.env.path=/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh



#resource.view.suffixs

resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class AlertServer { 
        logger.info("alert server ready start ");

        while (Stopper.isRunning()){

            try {

                Thread.sleep(Constants.ALERT_SCAN_INTERVEL);

                Thread.sleep(Constants.ALERT_SCAN_INTERVAL);

            } catch (InterruptedException e) {

                logger.error(e.getMessage(),e);

                Thread.currentThread().interrupt();

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Map; 
 * Enterprise WeChat Manager

 */

public class EnterpriseWeChatManager {

    private static final Logger logger = LoggerFactory.getLogger(MsgManager.class);

    private static final Logger logger = LoggerFactory.getLogger(EnterpriseWeChatManager.class);

    /**

     * Enterprise We Chat send

     * @param alert the alert