Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send interactives DCR traffic to new interactive-rendering app #26866

Merged
merged 1 commit into from
Feb 5, 2024
+5 −4
Merged

Send interactives DCR traffic to new interactive-rendering app #26866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/app/common/configuration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ class GuardianConfiguration extends GuLogging {
lazy val baseURL = configuration.getMandatoryStringProperty("rendering.baseURL")
lazy val articleBaseURL = configuration.getMandatoryStringProperty("article-rendering.baseURL")
lazy val faciaBaseURL = configuration.getMandatoryStringProperty("facia-rendering.baseURL")
lazy val interactiveBaseURL = configuration.getMandatoryStringProperty("interactive-rendering.baseURL")
lazy val sentryHost = configuration.getMandatoryStringProperty("rendering.sentryHost")
lazy val sentryPublicApiKey = configuration.getMandatoryStringProperty("rendering.sentryPublicApiKey")
lazy val timeout = 2.seconds
Expand Down
8 changes: 4 additions & 4 deletions common/app/renderers/DotcomRenderingService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
// Nb. interactives have a longer timeout because some of them are very
// large unfortunately. E.g.
// https://www.theguardian.com/education/ng-interactive/2018/may/29/university-guide-2019-league-table-for-computer-science-information.
post(ws, json, Configuration.rendering.baseURL + "/Interactive", page.metadata.cacheTime, 4.seconds)
post(ws, json, Configuration.rendering.interactiveBaseURL + "/Interactive", page.metadata.cacheTime, 4.seconds)
}

def getAMPInteractive(
Expand All @@ -320,7 +320,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload

val dataModel = DotcomRenderingDataModel.forInteractive(page, blocks, request, pageType)
val json = DotcomRenderingDataModel.toJson(dataModel)
post(ws, json, Configuration.rendering.baseURL + "/AMPInteractive", page.metadata.cacheTime)
post(ws, json, Configuration.rendering.interactiveBaseURL + "/AMPInteractive", page.metadata.cacheTime)
}

def getAppsInteractive(
Expand All @@ -336,7 +336,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
// Nb. interactives have a longer timeout because some of them are very
// large unfortunately. E.g.
// https://www.theguardian.com/education/ng-interactive/2018/may/29/university-guide-2019-league-table-for-computer-science-information.
post(ws, json, Configuration.rendering.baseURL + "/AppsInteractive", page.metadata.cacheTime, 4.seconds)
post(ws, json, Configuration.rendering.interactiveBaseURL + "/AppsInteractive", page.metadata.cacheTime, 4.seconds)
}

def getEmailNewsletters(
Expand All @@ -347,7 +347,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload

val dataModel = DotcomNewslettersPageRenderingDataModel.apply(page, newsletters, request)
val json = DotcomNewslettersPageRenderingDataModel.toJson(dataModel)
post(ws, json, Configuration.rendering.baseURL + "/EmailNewsletters", CacheTime.Facia)
post(ws, json, Configuration.rendering.faciaBaseURL + "/EmailNewsletters", CacheTime.Facia)
}

def getImageContent(
Expand Down
Loading