diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-03-26 14:52:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-26 14:52:57 +0200 |
commit | 3694a806b7639c593e1a54f7867447456523ae34 (patch) | |
tree | 02fdc612afc7a3163398f380f55bf365c3a937b8 /node-admin | |
parent | 72ee9ba2b0ffb692275928f410294646246b1668 (diff) |
Revert "Write secret-agent config"
Diffstat (limited to 'node-admin')
2 files changed, 0 insertions, 31 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index 7ad65c3d3fd..6c27e6842da 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -321,7 +321,6 @@ public class DockerOperationsImpl implements DockerOperations { */ private static Map<Path, Boolean> getDirectoriesToMount(Environment environment) { final Map<Path, Boolean> directoriesToMount = new HashMap<>(); - directoriesToMount.put(Paths.get("/var/log/secret-agent"), false); directoriesToMount.put(Paths.get("/etc/yamas-agent"), true); directoriesToMount.put(Paths.get("/etc/filebeat"), true); directoriesToMount.put(environment.pathInNodeUnderVespaHome("logs/daemontools_y"), false); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index d5d7e8260f1..6551b89a7e8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -97,7 +97,6 @@ public class StorageMaintainer { vespaSchedule.writeTo(yamasAgentFolder); hostLifeSchedule.writeTo(yamasAgentFolder); final String[] restartYamasAgent = new String[]{"service", "yamas-agent", "restart"}; - writeSecretAgentConfig(containerName); dockerOperations.executeCommandInContainerAsRoot(containerName, restartYamasAgent); } catch (IOException e) { throw new RuntimeException("Failed to write secret-agent schedules for " + containerName, e); @@ -434,33 +433,4 @@ public class StorageMaintainer { nextHandleOldCoredumpsAt = Instant.EPOCH; } } - - private void writeSecretAgentConfig(ContainerName containerName) { - String config = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + - "<log4j:configuration xmlns:log4j=\"http://jakarta.apache.org/log4j/\">\n" + - " <appender name=\"AppLog\" class=\"org.apache.log4j.rolling.RollingFileAppender\">\n" + - " <param name=\"Threshold\" value=\"Debug\" />\n" + - " <rollingPolicy class=\"org.apache.log4j.rolling.FixedWindowRollingPolicy\">\n" + - " <param name=\"FileNamePattern\" value=\"/var/log/secret-agent/collector-writer.%i\"/>\n" + - " <param name=\"MinIndex\" value=\"0\"/>\n" + - " <param name=\"MaxIndex\" value=\"100\"/>\n" + - " </rollingPolicy>\n" + - " <triggeringPolicy class=\"org.apache.log4j.rolling.SizeBasedTriggeringPolicy\">\n" + - " <param name=\"maxFileSize\" value=\"10MB\"/>\n" + - " </triggeringPolicy>\n" + - " <layout class=\"org.apache.log4j.PatternLayout\">\n" + - " <param name=\"ConversionPattern\" value=\"%d %-5p [%c] - %m%n\" />\n" + - " </layout>\n" + - " </appender>\n" + - "\n" + - " <root>\n" + - " <priority value=\"all\" />\n" + - " <appender-ref ref=\"AppLog\" />\n" + - " </root>\n" + - "</log4j:configuration>"; - - Path configPath = Paths.get("/etc/secret-agent/log4cxx.collector-writer.xml"); - String writeConfigCommand = String.format("echo '%s' > %s", config, configPath); - dockerOperations.executeCommandInContainerAsRoot(containerName, "/bin/sh", "-c", writeConfigCommand); - } } |