diff options
author | Jakob Odersky <jakob@driver.xyz> | 2017-11-19 23:29:03 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2017-11-20 00:07:42 -0800 |
commit | b872ee2649c7b56df413fbde746ee68312c17abd (patch) | |
tree | 34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/main/scala/xyz/driver/core/app/DriverApp.scala | |
parent | 871e25f5e5ba23ca9202009d49fb38386558edd9 (diff) | |
download | driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.gz driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.bz2 driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.zip |
Apply new formatting
Diffstat (limited to 'src/main/scala/xyz/driver/core/app/DriverApp.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/app/DriverApp.scala | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala index 5297c90..6ba9949 100644 --- a/src/main/scala/xyz/driver/core/app/DriverApp.scala +++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala @@ -32,18 +32,19 @@ import scala.util.control.NonFatal import scalaz.Scalaz.stringInstance import scalaz.syntax.equal._ -class DriverApp(appName: String, - version: String, - gitHash: String, - modules: Seq[Module], - time: TimeProvider = new SystemTimeProvider(), - log: Logger = Logger(LoggerFactory.getLogger(classOf[DriverApp])), - config: Config = core.config.loadDefaultConfig, - interface: String = "::0", - baseUrl: String = "localhost:8080", - scheme: String = "http", - port: Int = 8080, - tracer: Tracer = NoTracer)(implicit actorSystem: ActorSystem, executionContext: ExecutionContext) { +class DriverApp( + appName: String, + version: String, + gitHash: String, + modules: Seq[Module], + time: TimeProvider = new SystemTimeProvider(), + log: Logger = Logger(LoggerFactory.getLogger(classOf[DriverApp])), + config: Config = core.config.loadDefaultConfig, + interface: String = "::0", + baseUrl: String = "localhost:8080", + scheme: String = "http", + port: Int = 8080, + tracer: Tracer = NoTracer)(implicit actorSystem: ActorSystem, executionContext: ExecutionContext) { self => import DriverApp._ @@ -115,10 +116,11 @@ class DriverApp(appName: String, MDC.put("ip", ip.toOption.map(_.getHostAddress).getOrElse("unknown")) MDC.put("remoteHost", ip.toOption.map(_.getHostName).getOrElse("unknown")) - MDC.put("xForwardedFor", - extractHeader(request)("x-forwarded-for") - .orElse(extractHeader(request)("x_forwarded_for")) - .getOrElse("unknown")) + MDC.put( + "xForwardedFor", + extractHeader(request)("x-forwarded-for") + .orElse(extractHeader(request)("x_forwarded_for")) + .getOrElse("unknown")) MDC.put("remoteAddress", extractHeader(request)("remote-address").getOrElse("unknown")) MDC.put("userAgent", extractHeader(request)("user-agent").getOrElse("unknown")) } @@ -204,10 +206,11 @@ class DriverApp(appName: String, "totalGarbageCollections" -> gcStats.totalGarbageCollections.toJson ).toJson, "fileSystemSpace" -> SystemStats.fileSystemSpace.map { f => - Map("path" -> f.path.toJson, - "freeSpace" -> f.freeSpace.toJson, - "totalSpace" -> f.totalSpace.toJson, - "usableSpace" -> f.usableSpace.toJson) + Map( + "path" -> f.path.toJson, + "freeSpace" -> f.freeSpace.toJson, + "totalSpace" -> f.totalSpace.toJson, + "usableSpace" -> f.usableSpace.toJson) }.toJson, "operatingSystem" -> SystemStats.operatingSystemStats.toJson )) |