FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

move diagnostics away from Global and introduce app loader · devhttps/frontend@19be258 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 19be258

Browse files
Alexandre Dufournet
committed
move diagnostics away from Global and introduce app loader
1 parent babbb75 commit 19be258

9 files changed

Lines changed: 58 additions & 31 deletions

File tree

‎dev-build/app/AppLoader.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import play.api.routing.Router
2525
import router.Routes
2626
import rugby.conf.RugbyLifecycle
2727
import rugby.controllers.MatchesController
28-
import services.ConfigAgentLifecycle
28+
import services._
2929
import weather.controllers.{WeatherController, LocationsController}
3030

3131
class AppLoader extends FrontendApplicationLoader {
@@ -44,7 +44,8 @@ trait Controllers
4444
extends AdminControllers
4545
with AdminJobsControllers
4646
with ApplicationsControllers
47-
with ArticleControllers {
47+
with ArticleControllers
48+
with DiagnosticsControllers {
4849
self: BuiltInComponents with MostPopularComponents =>
4950
lazy val accessTokenGenerator = wire[AccessTokenGenerator]
5051
lazy val apiSandbox = wire[ApiSandbox]
@@ -62,7 +63,6 @@ trait Controllers
6263
lazy val ctaController = wire[CtaController]
6364
lazy val dedupedController = wire[DedupedController]
6465
lazy val devAssetsController = wire[DevAssetsController]
65-
lazy val diagnosticsController = wire[DiagnosticsController]
6666
lazy val emailSignupController = wire[EmailSignupController]
6767
lazy val faciaController = wire[FaciaControllerImpl]
6868
lazy val fixturesAndResultsContainerController = wire[FixturesAndResultsContainerController]

‎diagnostics/app/AppLoader.scala‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import app.{FrontendComponents, FrontendApplicationLoader}
2+
import com.softwaremill.macwire._
3+
import common._
4+
import common.Logback.LogstashLifecycle
5+
import conf.switches.SwitchboardLifecycle
6+
import conf.{CommonGzipFilter, CachedHealthCheckLifeCycle}
7+
import controllers.{Assets, DiagnosticsControllers, HealthCheck}
8+
import model.ApplicationIdentity
9+
import play.api.ApplicationLoader.Context
10+
import play.api.mvc.EssentialFilter
11+
import play.api.routing.Router
12+
import play.api._
13+
import router.Routes
14+
15+
class AppLoader extends FrontendApplicationLoader {
16+
override def buildComponents(context: Context): FrontendComponents = new BuiltInComponentsFromContext(context) with AppComponents
17+
}
18+
19+
trait Controllers extends DiagnosticsControllers {
20+
self: BuiltInComponents =>
21+
lazy val healthCheck = wire[HealthCheck]
22+
lazy val assets = wire[Assets]
23+
}
24+
25+
trait AppLifecycleComponents {
26+
self: FrontendComponents with Controllers =>
27+
28+
override lazy val lifecycleComponents = List(
29+
wire[LogstashLifecycle],
30+
wire[DiagnosticsLifecycle],
31+
wire[SwitchboardLifecycle],
32+
wire[CloudWatchMetricsLifecycle],
33+
wire[CachedHealthCheckLifeCycle]
34+
)
35+
}
36+
37+
trait AppComponents extends FrontendComponents with AppLifecycleComponents with Controllers {
38+
lazy val router: Router = wire[Routes]
39+
lazy val appIdentity = ApplicationIdentity("frontend-diagnostics")
40+
override lazy val httpFilters: Seq[EssentialFilter] = wire[CommonGzipFilter].filters
41+
}

‎diagnostics/app/Global.scala‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎diagnostics/app/controllers/DiagnosticsControllers.scala‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package controllers
2+
3+
import com.softwaremill.macwire._
4+
5+
trait DiagnosticsControllers {
6+
lazy val diagnosticsController = wire[DiagnosticsController]
7+
lazy val quizzesController = wire[QuizzesController]
8+
}

‎diagnostics/app/controllers/HealthCheck.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package controllers
22

33
import conf.AllGoodCachedHealthCheck
44

5-
object HealthCheck extends AllGoodCachedHealthCheck(9006, "/robots.txt")
5+
class HealthCheck extends AllGoodCachedHealthCheck(9006, "/robots.txt")

‎diagnostics/app/controllers/QuizzesController.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.concurrent.ExecutionContext.Implicits
99
import scala.concurrent.Future
1010

1111
// Deprecated service, we won't support quiz results soon.
12-
object QuizzesController extends Controller with Logging {
12+
class QuizzesController extends Controller with Logging {
1313

1414
implicit val ec = Implicits.global
1515

‎diagnostics/conf/application.conf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ play {
3434
compressionEnabled: true
3535
}
3636

37-
http {
38-
filters: "conf.CommonGzipFilter"
39-
}
37+
application.loader = AppLoader
4038
}
4139

4240
guardian: {

‎diagnostics/test/package.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ class DiagnosticsTestSuite extends Suites (
77
// Add you test classes here
88
) with SingleServerSuite {
99

10-
override lazy val port: Int = HealthCheck.testPort
10+
override lazy val port: Int = new HealthCheck().testPort
1111
}

‎project/Frontend.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ object Frontend extends Build with Prototypes {
9999
val diagnostics = application("diagnostics").dependsOn(commonWithTests).aggregate(common).settings(
100100
libraryDependencies ++= Seq(
101101
uaDetectorResources
102-
)
102+
),
103+
RoutesKeys.routesGenerator := InjectedRoutesGenerator
103104
)
104105

105106
val admin = application("admin").dependsOn(commonWithTests).aggregate(common).settings(

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL