Commit ffdc176a authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

treat jvm version as optional on nodes info 

aws won’t return the jvm version
parent edfe62b4

app/models/overview/Node.scala

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ object Node { 
    // AWS nodes return no host/ip info

    val host = (info \ "host").asOpt[JsString].getOrElse(JsNull)

    val ip = (info \ "ip").asOpt[JsString].getOrElse(JsNull)

    val jvmVersion = (info \ "jvm" \ "version").asOpt[JsString].getOrElse(JsNull)



    Json.obj(

      "id" -> JsString(id),
@@ -19,7 +20,7 @@ object Node { 
      "host" -> host,

      "ip" -> ip,

      "es_version" -> (info \ "version").as[JsString],

      "jvm_version" -> (info \ "jvm" \ "version").as[JsString],

      "jvm_version" -> jvmVersion,

      "load_average" -> loadAverage(stats),

      "available_processors" -> (info \ "os" \ "available_processors").as[JsNumber],

      "cpu_percent" -> cpuPercent(stats),

test/models/overview/NodeSpec.scala

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ object NodeSpec extends Specification { 
        |  "host": null,

        |  "ip": null,

        |  "es_version": "2.1.0",

        |  "jvm_version": "1.8.0_72",

        |  "jvm_version": null,

        |  "load_average": 3.17138671875,

        |  "available_processors": 8,

        |  "cpu_percent": 0,

test/models/overview/NodesInfo.scala

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ object NodesInfo { 
      |  },

      |  "jvm":{

      |    "pid":60238,

      |    "version":"1.8.0_72",

      |    "vm_name":"Java HotSpot(TM) 64-Bit Server VM",

      |    "vm_version":"25.72-b15",

      |    "vm_vendor":"Oracle Corporation",