diff options
| author | vlad <vlad@drivergrp.com> | 2016-09-26 13:05:25 -0700 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-09-26 13:05:25 -0700 |
| commit | 016a0362f9eb00dc64511d9e32b920aa04ab8a48 (patch) | |
| tree | ce2f1c10e5240239019e34f020fe49fe589ef1d7 | |
| parent | 6d5e4046a039a1f9fdb7dbb49fc65a63eecfb2d1 (diff) | |
| download | driver-core-016a0362f9eb00dc64511d9e32b920aa04ab8a48.tar.gz driver-core-016a0362f9eb00dc64511d9e32b920aa04ab8a48.tar.bz2 driver-core-016a0362f9eb00dc64511d9e32b920aa04ab8a48.zip | |
Uptime in /version and empty entity fixv0.8.7
| -rw-r--r-- | src/main/scala/com/drivergrp/core/app.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/com/drivergrp/core/rest.scala | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala index 8018ab4..17c63f5 100644 --- a/src/main/scala/com/drivergrp/core/app.scala +++ b/src/main/scala/com/drivergrp/core/app.scala @@ -109,13 +109,15 @@ object app { import SprayJsonSupport._ path("version") { + val currentTime = time.currentTime().millis complete( Map( "version" -> version, "gitHash" -> gitHash, "modules" -> modules.map(_.name).mkString(", "), "startupTime" -> startupTime.millis.toString, - "serverTime" -> time.currentTime().millis.toString + "serverTime" -> currentTime.toString, + "uptime" -> (currentTime - startupTime.millis).toString )) } } diff --git a/src/main/scala/com/drivergrp/core/rest.scala b/src/main/scala/com/drivergrp/core/rest.scala index ebfb98e..89a0c75 100644 --- a/src/main/scala/com/drivergrp/core/rest.scala +++ b/src/main/scala/com/drivergrp/core/rest.scala @@ -60,7 +60,9 @@ object rest { log.audit(s"Sending to ${request.uri} request $request") val responseEntity = Http()(actorSystem).singleRequest(request)(materializer) map { response => - if(response.status.isFailure() && response.status != StatusCodes.NotFound) { + if(response.status == StatusCodes.NotFound) { + Unmarshal(HttpEntity.Empty: ResponseEntity) + } else if(response.status.isFailure()) { throw new Exception("Http status is failure " + response.status) } else { Unmarshal(response.entity.transformDataBytes(decryptionFlow)) |