From 9fb704e6862a508fd05b27bd6a159e56fdb193ef Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 23 Sep 2015 14:16:43 -0500 Subject: [PATCH] Update Java docs on how Java is detected --- client/driver/java.go | 1 - website/source/docs/drivers/java.html.md | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/driver/java.go b/client/driver/java.go index 31960512e..bd0667a77 100644 --- a/client/driver/java.go +++ b/client/driver/java.go @@ -77,7 +77,6 @@ func (d *JavaDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, // OpenJDK Runtime Environment (IcedTea6 1.13.8) (6b36-1.13.8-0ubuntu1~12.04) // OpenJDK 64-Bit Server VM (build 23.25-b01, mixed mode) // Each line is terminated by \n - info := strings.Split(infoString, "\n") versionString := info[0] versionString = strings.TrimPrefix(versionString, "java version ") diff --git a/website/source/docs/drivers/java.html.md b/website/source/docs/drivers/java.html.md index e10b000fd..11018965e 100644 --- a/website/source/docs/drivers/java.html.md +++ b/website/source/docs/drivers/java.html.md @@ -34,8 +34,8 @@ over HTTP. The `java` driver will set the following client attributes: -* `driver.java` - This will always be set to "1", indicating the - driver is available. +* `driver.java` - Set to `1` if Java is found on the host node. Nomad determines +this by executing `java -version` on the host and parsing the output * `driver.java.version` - Version of Java, ex: `1.6.0_65` * `driver.java.runtime` - Runtime version, ex: `Java(TM) SE Runtime Environment (build 1.6.0_65-b14-466.1-11M4716)` * `driver.java.vm` - Virtual Machine information, ex: `Java HotSpot(TM) 64-Bit Server VM (build 20.65-b04-466.1, mixed mode)`