summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHaakon Dybdahl <dybdahl@yahoo-inc.com>2017-03-15 08:13:19 +0100
committerHaakon Dybdahl <dybdahl@yahoo-inc.com>2017-03-15 08:13:19 +0100
commit1e8798882af478c70fe9a2c1635737c436bfc02f (patch)
tree1190c61aeac8b636a2e8d7d1bc617ce485b7022c /node-admin
parenta01e01dde7b223cff52ca7d752b61fa6c4f0b2e2 (diff)
Use java 8 instead of apache
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java4
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 5029a7578bf..7a88bcad024 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -19,9 +19,9 @@ import com.yahoo.vespa.hosted.node.admin.util.Environment;
import com.yahoo.vespa.hosted.node.admin.util.PrefixLogger;
import com.yahoo.vespa.hosted.node.admin.util.SecretAgentScheduleMaker;
import com.yahoo.vespa.hosted.provision.Node;
-import org.apache.commons.io.FileUtils;
import java.io.IOException;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
@@ -204,7 +204,7 @@ public class NodeAgentImpl implements NodeAgent {
return;
}
Path filebeatPath = environment.pathInNodeAdminFromPathInNode(containerName, "/etc/filebeat/filebeat.yml");
- FileUtils.writeStringToFile(filebeatPath.toFile(), config.get());
+ Files.write(filebeatPath, config.get().getBytes());
logger.info("Wrote filebeat config.");
} catch (Throwable t) {
logger.error("Failed writing filebeat config; " + nodeSpec, t);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
index d84e1c7c039..df7fe151cae 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
@@ -62,7 +62,8 @@ public class Environment {
String region,
String parentHostHostname,
InetAddressResolver inetAddressResolver,
- PathResolver pathResolver, List<String> logstashNodes) {
+ PathResolver pathResolver,
+ List<String> logstashNodes) {
this.configServerHosts = configServerHosts;
this.environment = environment;
this.region = region;