You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2020/12/08 17:57:41 UTC
[trafficcontrol] branch 5.0.x updated (38c86ba -> 461777a)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a change to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from 38c86ba Validate ORG server for topology based DS (#5307)
new 3d5c521 Fix TR NullPointerException from LetsEncryptDnsChallengeWatcher (#5342)
new f122423 Lowercase the PowerTools repo id (#5362)
new 461777a Increase builder compose file version to 2.1 (#5356)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 3 ++-
infrastructure/docker/build/docker-compose.yml | 2 +-
.../core/ds/LetsEncryptDnsChallengeWatcher.java | 12 +++---------
3 files changed, 6 insertions(+), 11 deletions(-)
[trafficcontrol] 02/03: Lowercase the PowerTools repo id (#5362)
Posted by oc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit f12242399fcc92eb3c218b2f6f1345f2170c1b97
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Tue Dec 8 10:22:49 2020 -0700
Lowercase the PowerTools repo id (#5362)
(cherry picked from commit 28d9a693f2ee6423070370ccfc1f93551a584a7e)
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 5b3e42d..1397f78 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -63,7 +63,8 @@ EXPOSE 443
ENV MOJO_MODE production
RUN if [[ "${RHEL_VERSION%%.*}" -ge 8 ]]; then \
- enable_repo='--enablerepo=PowerTools' || exit 1; \
+ # If you get "Unknown repo: 'powertools'", pull a newer centos:8 image
+ enable_repo='--enablerepo=powertools' || exit 1; \
fi && \
dnf -y --allowerasing $enable_repo install \
cpanminus \
[trafficcontrol] 01/03: Fix TR NullPointerException from
LetsEncryptDnsChallengeWatcher (#5342)
Posted by oc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 3d5c52161869042a005cc4ccc64188c7f0820d76
Author: Rawlin Peters <ra...@apache.org>
AuthorDate: Tue Dec 8 09:31:53 2020 -0700
Fix TR NullPointerException from LetsEncryptDnsChallengeWatcher (#5342)
Because databasesDirectory is already a property of the extended class
AbstractServiceUpdater, it should not be redeclared in
LetsEncryptDnsChallengeWatcher.
Also, log exceptions when catching them in order to capture the full
stacktraces in the log.
(cherry picked from commit d4780c387eac270ca301387a7dd4ff0f18f37436)
---
.../core/ds/LetsEncryptDnsChallengeWatcher.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java
index f009f6a..8525251 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java
@@ -29,7 +29,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.log4j.Logger;
import java.io.*;
-import java.nio.file.Path;
import java.time.Instant;
import java.util.HashMap;
import java.util.List;
@@ -40,7 +39,6 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher {
private String configFile;
private ConfigHandler configHandler;
- private Path databasesDirectory;
public LetsEncryptDnsChallengeWatcher() {
setDatabaseUrl(DEFAULT_LE_DNS_CHALLENGE_URL);
@@ -106,7 +104,7 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher {
return true;
} catch (Exception e) {
- LOGGER.warn("Failed updating dns challenge txt record with data from " + dataBaseURL + ": " + e.getMessage());
+ LOGGER.warn("Failed updating dns challenge txt record with data from " + dataBaseURL + ":", e);
}
return false;
@@ -119,7 +117,7 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher {
mapper.readValue(data, new TypeReference<HashMap<String, List<LetsEncryptDnsChallenge>>>() { });
return true;
} catch (Exception e) {
- LOGGER.warn("Failed to build dns challenge data while verifying");
+ LOGGER.warn("Failed to build dns challenge data while verifying:", e);
}
return false;
@@ -142,7 +140,7 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher {
}
return sb.toString();
} catch (Exception e) {
- LOGGER.error("Could not read cr-config file " + configFile + ".");
+ LOGGER.error("Could not read cr-config file " + configFile + ":", e);
return null;
}
}
@@ -183,10 +181,6 @@ public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher {
return this.configHandler;
}
- public void setDatabasesDirectory(final Path databasesDirectory) {
- this.databasesDirectory = databasesDirectory;
- }
-
public void setConfigFile(final String configFile) {
this.configFile = configFile;
}
[trafficcontrol] 03/03: Increase builder compose file version to
2.1 (#5356)
Posted by oc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 461777aa2ed529b2a4b8385ce09aff4eed6f6877
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Tue Dec 8 10:31:03 2020 -0700
Increase builder compose file version to 2.1 (#5356)
* Increase builder compose file version to 2.1
* Use compose file version 2.1 for optional compose files
* Inherit RHEL_VERSION argument from environment now that the compose file version is 2.1
(cherry picked from commit 9597ead3adb821bc837713b17defa2e21852e874)
---
infrastructure/docker/build/docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 9df7af9..4738df6 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
---
-version: '2'
+version: '2.1'
services:
source: