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

Integrate the injected lifecycle in the legacy Globals · devhttps/frontend@4a89115 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 4a89115

Browse files
Alexandre Dufournet
committed
Integrate the injected lifecycle in the legacy Globals
1 parent 9cf03ff commit 4a89115

12 files changed

Lines changed: 141 additions & 67 deletions

File tree

‎dev-build/app/Global.scala‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import commercial.CommercialLifecycle
2+
import dfp.DfpDataCacheLifecycle
23
import common.dfp.FaciaDfpAgentLifecycle
34
import common._
45
import conf._
56
import conf.switches.SwitchboardLifecycle
67
import contentapi.SectionsLookUpLifecycle
7-
import _root_.dfp.DfpDataCacheLifecycle
8+
import cricket.conf.CricketLifecycle
89
import feed.{MostPopularFacebookAutoRefreshLifecycle, MostReadLifecycle, OnwardJourneyLifecycle}
910
import model.AdminLifecycle
1011
import ophan.SurgingContentAgentLifecycle
@@ -17,23 +18,23 @@ import headlines.ABHeadlinesLifecycle
1718
import scala.concurrent.ExecutionContext
1819

1920
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
20-
with DiagnosticsLifecycle
21-
with OnwardJourneyLifecycle
22-
with MostReadLifecycle
2321
with FaciaDfpAgentLifecycle
2422
with ConfigAgentLifecycle
2523
with SurgingContentAgentLifecycle
2624
with SectionsLookUpLifecycle
27-
with MostPopularFacebookAutoRefreshLifecycle
2825
with SwitchboardLifecycle
29-
with FootballLifecycle
30-
with CricketLifecycle
31-
with RugbyLifecycle
3226
with ABHeadlinesLifecycle {
3327

3428
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
35-
new AdminLifecycle(appLifecycle)(ec),
36-
new CommercialLifecycle(appLifecycle)(ec),
37-
new DfpDataCacheLifecycle(appLifecycle)(ec)
29+
new AdminLifecycle(appLifecycle),
30+
new DiagnosticsLifecycle(appLifecycle),
31+
new OnwardJourneyLifecycle(appLifecycle),
32+
new CommercialLifecycle(appLifecycle),
33+
new MostReadLifecycle(appLifecycle),
34+
new DfpDataCacheLifecycle(appLifecycle),
35+
new MostPopularFacebookAutoRefreshLifecycle(appLifecycle),
36+
new FootballLifecycle(appLifecycle),
37+
new CricketLifecycle(appLifecycle),
38+
new RugbyLifecycle(appLifecycle)
3839
)
3940
}

‎diagnostics/app/Global.scala‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
import common.Logback.Logstash
2-
import common.{CloudWatchApplicationMetrics, DiagnosticsLifecycle}
3-
import conf.DiagnosticsHealthCheckLifeCycle
2+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics, DiagnosticsLifecycle}
3+
import conf.InjectedCachedHealthCheckLifeCycle
44
import conf.switches.SwitchboardLifecycle
5+
import controllers.HealthCheck
6+
import play.api.GlobalSettings
7+
import play.api.inject.ApplicationLifecycle
58

6-
object Global
7-
extends DiagnosticsLifecycle
9+
import scala.concurrent.ExecutionContext
10+
11+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
812
with SwitchboardLifecycle
913
with CloudWatchApplicationMetrics
10-
with Logstash
11-
with DiagnosticsHealthCheckLifeCycle {
14+
with Logstash {
1215
override lazy val applicationName = "frontend-diagnostics"
16+
17+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
18+
new DiagnosticsLifecycle(appLifecycle),
19+
new InjectedCachedHealthCheckLifeCycle(HealthCheck)
20+
)
1321
}

‎discussion/app/Global.scala‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
import common.CloudWatchApplicationMetrics
1+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics}
22
import common.Logback.Logstash
33
import conf._
44
import conf.switches.SwitchboardLifecycle
55
import filters.RequestLoggingFilter
6+
import play.api.GlobalSettings
67
import play.api.http.HttpFilters
8+
import play.api.inject.ApplicationLifecycle
79
import play.api.mvc.EssentialFilter
810

9-
object Global extends CloudWatchApplicationMetrics
11+
import scala.concurrent.ExecutionContext
12+
13+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
14+
with CloudWatchApplicationMetrics
1015
with SwitchboardLifecycle
11-
with Logstash
12-
with DiscussionHealthCheckLifeCycle {
16+
with Logstash {
1317
override lazy val applicationName = "frontend-discussion"
18+
19+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = Nil
1420
}
1521

1622
class DiscussionFilters extends HttpFilters {

‎facia-press/app/Global.scala‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import common.Logback.Logstash
22
import common._
33
import conf.switches.SwitchboardLifecycle
4-
import conf.{Configuration => GuardianConfiguration}
5-
import frontpress.{FrontPressCron, ToolPressQueueWorker}
64
import play.api.GlobalSettings
5+
import play.api.inject.ApplicationLifecycle
76
import services.ConfigAgentLifecycle
87

9-
object Global extends GlobalSettings
8+
import scala.concurrent.ExecutionContext
9+
10+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
1011
with ConfigAgentLifecycle
1112
with SwitchboardLifecycle
1213
with CloudWatchApplicationMetrics
@@ -25,4 +26,6 @@ object Global extends GlobalSettings
2526
FaciaPressMetrics.AuPressLatencyMetric,
2627
FaciaPressMetrics.AllFrontsPressLatencyMetric
2728
)
29+
30+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = Nil
2831
}

‎facia/app/Global.scala‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
import common.Logback.Logstash
22
import common._
33
import common.dfp.FaciaDfpAgentLifecycle
4-
import conf.FaciaHealthCheckLifeCycle
4+
import conf.InjectedCachedHealthCheckLifeCycle
55
import conf.switches.SwitchboardLifecycle
6+
import controllers.HealthCheck
67
import crosswords.TodaysCrosswordGridLifecycle
78
import headlines.ABHeadlinesLifecycle
89
import ophan.SurgingContentAgentLifecycle
10+
import play.api.GlobalSettings
11+
import play.api.inject.ApplicationLifecycle
912
import services.{ConfigAgentLifecycle, IndexListingsLifecycle}
1013

11-
object Global extends ConfigAgentLifecycle
14+
import scala.concurrent.ExecutionContext
15+
16+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
17+
with ConfigAgentLifecycle
1218
with CloudWatchApplicationMetrics
1319
with FaciaDfpAgentLifecycle
1420
with SurgingContentAgentLifecycle
1521
with IndexListingsLifecycle
1622
with TodaysCrosswordGridLifecycle
1723
with SwitchboardLifecycle
1824
with ABHeadlinesLifecycle
19-
with Logstash
20-
with FaciaHealthCheckLifeCycle {
25+
with Logstash {
2126

2227
override lazy val applicationName = "frontend-facia"
28+
29+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
30+
new InjectedCachedHealthCheckLifeCycle(HealthCheck)
31+
)
2332
}

‎identity/app/Global.scala‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
import common.CloudWatchApplicationMetrics
1+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics}
22
import common.Logback.Logstash
33
import conf._
44
import conf.switches.SwitchboardLifecycle
55
import play.api._
6+
import play.api.inject.ApplicationLifecycle
67
import play.api.inject.guice._
78
import utils.SafeLogging
89

9-
object Global extends SafeLogging
10+
import scala.concurrent.ExecutionContext
11+
12+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
13+
with SafeLogging
1014
with CloudWatchApplicationMetrics
11-
with IdentityLifecycle
1215
with SwitchboardLifecycle
13-
with Logstash
14-
with IdentityHealthCheckLifeCycle {
16+
with Logstash {
1517

1618
override lazy val applicationName = "frontend-identity"
19+
20+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
21+
new IdentityLifecycle(appLifecycle)
22+
)
1723
}
1824

1925
class IdentityApplicationLoader extends GuiceApplicationLoader() {

‎onward/app/Global.scala‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
import business.StocksDataLifecycle
22
import common.Logback.Logstash
3-
import common.{CloudWatchApplicationMetrics, ContentApiMetrics}
3+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics, ContentApiMetrics}
44
import conf.switches.SwitchboardLifecycle
5-
import conf.OnwardHealthCheckLifeCycle
5+
import conf.InjectedCachedHealthCheckLifeCycle
6+
import controllers.HealthCheck
67
import feed.{MostPopularFacebookAutoRefreshLifecycle, MostReadLifecycle, OnwardJourneyLifecycle}
78
import metrics.FrontendMetric
9+
import play.api.GlobalSettings
10+
import play.api.inject.ApplicationLifecycle
811

9-
object Global extends OnwardJourneyLifecycle
12+
import scala.concurrent.ExecutionContext
13+
14+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
1015
with CloudWatchApplicationMetrics
11-
with MostReadLifecycle
12-
with StocksDataLifecycle
13-
with MostPopularFacebookAutoRefreshLifecycle
1416
with SwitchboardLifecycle
15-
with Logstash
16-
with OnwardHealthCheckLifeCycle {
17+
with Logstash {
1718
override lazy val applicationName = "frontend-onward"
1819

1920
override def applicationMetrics: List[FrontendMetric] = super.applicationMetrics ++ Seq(
2021
ContentApiMetrics.HttpTimeoutCountMetric,
2122
ContentApiMetrics.ContentApiErrorMetric
2223
)
24+
25+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
26+
new InjectedCachedHealthCheckLifeCycle(HealthCheck),
27+
new OnwardJourneyLifecycle(appLifecycle),
28+
new MostReadLifecycle(appLifecycle),
29+
new StocksDataLifecycle(appLifecycle),
30+
new MostPopularFacebookAutoRefreshLifecycle(appLifecycle)
31+
)
2332
}

‎preview/app/Global.scala‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
import controllers.PreviewHealthCheckLifeCycle
1+
import common.LifecycleComponent
2+
import conf.InjectedCachedHealthCheckLifeCycle
3+
import controllers.HealthCheck
4+
import play.api.inject.ApplicationLifecycle
25

3-
object Global extends StandaloneGlobal with PreviewHealthCheckLifeCycle
6+
import scala.concurrent.ExecutionContext
7+
8+
object Global extends StandaloneGlobal {
9+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = {
10+
super.lifecycleComponents(appLifecycle) :+ new InjectedCachedHealthCheckLifeCycle(HealthCheck)
11+
}
12+
}

‎rss/app/Global.scala‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
import common.Logback.Logstash
2-
import common.{CloudWatchApplicationMetrics, ContentApiMetrics}
2+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics, ContentApiMetrics}
33
import conf._
44
import conf.switches.SwitchboardLifecycle
55
import contentapi.SectionsLookUpLifecycle
6+
import controllers.HealthCheck
67
import metrics.FrontendMetric
78
import ophan.SurgingContentAgentLifecycle
9+
import play.api.GlobalSettings
10+
import play.api.inject.ApplicationLifecycle
811
import services.ConfigAgentLifecycle
912

10-
object Global extends ConfigAgentLifecycle
13+
import scala.concurrent.ExecutionContext
14+
15+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
16+
with ConfigAgentLifecycle
1117
with CloudWatchApplicationMetrics
1218
with SurgingContentAgentLifecycle
1319
with SectionsLookUpLifecycle
1420
with SwitchboardLifecycle
15-
with Logstash
16-
with RssHealthCheckLifeCycle {
21+
with Logstash {
1722
override lazy val applicationName = "frontend-rss"
1823

1924
override def applicationMetrics: List[FrontendMetric] = super.applicationMetrics ++ List(
2025
ContentApiMetrics.HttpTimeoutCountMetric,
2126
ContentApiMetrics.HttpLatencyTimingMetric,
2227
ContentApiMetrics.ContentApiErrorMetric
2328
)
29+
30+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
31+
new InjectedCachedHealthCheckLifeCycle(HealthCheck)
32+
)
2433
}

‎sport/app/Global.scala‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
import common.CloudWatchApplicationMetrics
1+
import common.{LifecycleComponent, BackwardCompatibleLifecycleComponents, CloudWatchApplicationMetrics}
22
import common.Logback.Logstash
33
import conf._
44
import conf.switches.SwitchboardLifecycle
5+
import cricket.conf.CricketLifecycle
6+
import football.controllers.HealthCheck
57
import ophan.SurgingContentAgentLifecycle
8+
import play.api.GlobalSettings
9+
import play.api.inject.ApplicationLifecycle
610
import rugby.conf.RugbyLifecycle
711

8-
object Global extends CloudWatchApplicationMetrics
12+
import scala.concurrent.ExecutionContext
13+
14+
object Global extends GlobalSettings with BackwardCompatibleLifecycleComponents
15+
with CloudWatchApplicationMetrics
916
with SurgingContentAgentLifecycle
1017
with SwitchboardLifecycle
11-
with FootballLifecycle
12-
with CricketLifecycle
13-
with RugbyLifecycle
14-
with Logstash
15-
with SportHealthCheckLifeCycle {
18+
with Logstash {
1619
override lazy val applicationName = "frontend-sport"
20+
21+
override def lifecycleComponents(appLifecycle: ApplicationLifecycle)(implicit ec: ExecutionContext): List[LifecycleComponent] = List(
22+
new FootballLifecycle(appLifecycle),
23+
new CricketLifecycle(appLifecycle),
24+
new RugbyLifecycle(appLifecycle),
25+
new InjectedCachedHealthCheckLifeCycle(HealthCheck)
26+
)
1727
}

0 commit comments

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