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

Remove the handling of filters from the global of each individual app… · devhttps/frontend@9c31ba6 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 9c31ba6

Browse files
alexduf
committed
Remove the handling of filters from the global of each individual application
1 parent 65da0b6 commit 9c31ba6

37 files changed

Lines changed: 173 additions & 107 deletions

‎admin-jobs/app/Global.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
import common.Logback.Logstash
22
import common.{CloudWatchApplicationMetrics, ContentApiMetrics}
3-
import conf.{AdminJobsHealthCheckLifeCycle, Filters, SwitchboardLifecycle}
3+
import conf.{AdminJobsHealthCheckLifeCycle, SwitchboardLifecycle}
44
import contentapi.SectionsLookUpLifecycle
55
import dev.DevParametersLifecycle
66
import metrics.FrontendMetric
77
import ophan.SurgingContentAgentLifecycle
8-
import play.api.mvc.WithFilters
98
import services.ConfigAgentLifecycle
109

11-
object Global extends WithFilters(Filters.common: _*)
12-
with ConfigAgentLifecycle
10+
object Global extends ConfigAgentLifecycle
1311
with DevParametersLifecycle
1412
with CloudWatchApplicationMetrics
1513
with SurgingContentAgentLifecycle

‎admin-jobs/conf/application.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ play {
3333
ws {
3434
compressionEnabled: true
3535
}
36+
37+
http {
38+
filters: "conf.CommonFilters"
39+
}
3640
}
3741

3842
guardian: {

‎admin/app/Global.scala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import common.CloudWatchApplicationMetrics
22
import common.Logback.Logstash
33
import common.dfp.DfpAgentLifecycle
4-
import conf.{Gzipper, SwitchboardLifecycle}
4+
import conf.SwitchboardLifecycle
55
import controllers.AdminHealthCheckLifeCycle
66
import dfp.DfpDataCacheLifecycle
77
import model.AdminLifecycle
88
import ophan.SurgingContentAgentLifecycle
9-
import play.api.mvc.{RequestHeader, Results, WithFilters}
9+
import play.api.mvc._
1010
import purge.SoftPurge
1111
import services.ConfigAgentLifecycle
1212

1313
import scala.concurrent.Future
1414

15-
object Global extends WithFilters(Gzipper)
16-
with AdminLifecycle
15+
object Global extends AdminLifecycle
1716
with ConfigAgentLifecycle
1817
with SwitchboardLifecycle
1918
with CloudWatchApplicationMetrics

‎admin/conf/application.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ play {
3939
ws {
4040
compressionEnabled: true
4141
}
42+
43+
http {
44+
filters: "conf.CommonGzipFilter"
45+
}
4246
}
4347

4448
guardian: {

‎applications/app/Global.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import common.Logback.Logstash
22
import common.dfp.DfpAgentLifecycle
33
import common.{CloudWatchApplicationMetrics, ContentApiMetrics, EmailSubsciptionMetrics}
4-
import conf.{ApplicationsHealthCheckLifeCycle, CorsErrorHandler, Filters, SwitchboardLifecycle}
4+
import conf.{ApplicationsHealthCheckLifeCycle, CorsErrorHandler, SwitchboardLifecycle}
55
import contentapi.SectionsLookUpLifecycle
66
import dev.DevParametersLifecycle
77
import jobs.SiteMapLifecycle
88
import metrics.FrontendMetric
99
import ophan.SurgingContentAgentLifecycle
10-
import play.api.mvc.WithFilters
1110
import services.{ConfigAgentLifecycle, IndexListingsLifecycle}
1211

13-
object Global extends WithFilters(Filters.common: _*)
14-
with ConfigAgentLifecycle
12+
object Global extends ConfigAgentLifecycle
1513
with DevParametersLifecycle
1614
with CloudWatchApplicationMetrics
1715
with DfpAgentLifecycle

‎applications/conf/application.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ play {
3333
ws {
3434
compressionEnabled: true
3535
}
36+
37+
http {
38+
filters: "conf.CommonFilters"
39+
}
3640
}
3741

3842
guardian: {

‎archive/app/Global.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import common.CloudWatchApplicationMetrics
22
import common.Logback.Logstash
3-
import conf.{ArchiveHealthCheckLifeCycle, CorsErrorHandler, Filters, SwitchboardLifecycle}
3+
import conf.{ArchiveHealthCheckLifeCycle, CorsErrorHandler, SwitchboardLifecycle}
44
import dev.DevParametersLifecycle
5-
import play.api.mvc.WithFilters
65
import services.ArchiveMetrics
76

8-
object Global extends WithFilters(Filters.common: _*)
9-
with DevParametersLifecycle
7+
object Global extends DevParametersLifecycle
108
with CloudWatchApplicationMetrics
119
with ArchiveMetrics
1210
with CorsErrorHandler

‎archive/conf/application.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ play {
3333
ws {
3434
compressionEnabled: true
3535
}
36+
37+
http {
38+
filters: "conf.CommonFilters"
39+
}
3640
}
3741

3842
guardian: {

‎article/app/Global.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import common.Logback.Logstash
22
import common.dfp.DfpAgentLifecycle
33
import common.{CloudWatchApplicationMetrics, ContentApiMetrics}
4-
import conf.{ArticleHealthCheckLifeCycle, CorsErrorHandler, Filters, SwitchboardLifecycle}
4+
import conf.{ArticleHealthCheckLifeCycle, CorsErrorHandler, SwitchboardLifecycle}
55
import dev.DevParametersLifecycle
66
import metrics.FrontendMetric
77
import ophan.SurgingContentAgentLifecycle
8-
import play.api.mvc.WithFilters
98
import services.NewspaperBooksAndSectionsAutoRefresh
109

1110
object Global
12-
extends WithFilters(Filters.common: _*)
13-
with NewspaperBooksAndSectionsAutoRefresh
11+
extends NewspaperBooksAndSectionsAutoRefresh
1412
with DevParametersLifecycle
1513
with DfpAgentLifecycle
1614
with CloudWatchApplicationMetrics

‎article/conf/application.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ play {
3333
ws {
3434
compressionEnabled: true
3535
}
36+
37+
http {
38+
filters: "conf.CommonFilters"
39+
}
3640
}
3741

3842
guardian: {

0 commit comments

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