mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-04 11:50:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

1.CVE-2018-10237 2.typo (#1892)

Browse Source
This commit is contained in:
tiger.yan
2020-06-18 14:25:17 +08:00
committed by GitHub
parent b29b276fa3
commit 96af22be57
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@@ -48,11 +48,6 @@
<name>Maven Repository Switchboard</name>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>repo2</id>
<name>Human Readable Name for this Mirror.</name>
<url>https://repo2.maven.org/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>jenkins</id>
<name>Jenkins Releases Repository</name>
@@ -74,7 +69,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
<version>24.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -206,12 +201,24 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>2.11.0</version>
<version>4.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>2.11.0</version>
<version>4.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -223,8 +230,17 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.6</version>
</dependency>
<!-- joda time execute time -->
<dependency>
<groupId>joda-time</groupId>

2
src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java
View File

@@ -239,7 +239,7 @@ public class MySQLHeartbeat {
long timeDiff = System.currentTimeMillis() - this.startErrorTime.longValue();
if (timeDiff >= heartbeatTimeout) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("error heartbaet continued for more than " + timeDiff + " Milliseconds and heartbeat Timeout is " + heartbeatTimeout + " Milliseconds");
LOGGER.debug("error heartbeat continued for more than " + timeDiff + " Milliseconds and heartbeat Timeout is " + heartbeatTimeout + " Milliseconds");
}
return false;
}