Commit 4397bc6
Matthew Walls
Log out results of picker
1 parent ac96bfa commit 4397bc6
2 files changed
Lines changed: 10 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,7 +6,7 @@ import conf.switches.Switches | |||
| 6 | 6 | import contentapi.ContentApiClient | |
| 7 | 7 | import model.ParseBlockId.{InvalidFormat, ParsedBlockId} | |
| 8 | 8 | import model.Cached.{RevalidatableResult, WithoutRevalidationResult} | |
| 9 | - import model._ | ||
| 9 | + import model.{PageWithStoryPackage, _} | ||
| 10 | 10 | import LiveBlogHelpers._ | |
| 11 | 11 | import conf.Configuration | |
| 12 | 12 | import model.liveblog._ | |
@@ -24,6 +24,7 @@ import scala.concurrent.Future | |||
| 24 | 24 | import java.lang.System.currentTimeMillis | |
| 25 | 25 | ||
| 26 | 26 | import metrics.TimingMetric | |
| 27 | + import services.{LocalRender, RemoteRender, RenderType, RenderingTierPicker} | ||
| 27 | 28 | ||
| 28 | 29 | case class ArticlePage(article: Article, related: RelatedContent) extends PageWithStoryPackage | |
| 29 | 30 | case class MinutePage(article: Article, related: RelatedContent) extends PageWithStoryPackage | |
@@ -116,6 +117,12 @@ class ArticleController(contentApiClient: ContentApiClient, val controllerCompon | |||
| 116 | 117 | } | |
| 117 | 118 | ||
| 118 | 119 | case article: ArticlePage => | |
| 120 | + | ||
| 121 | + RenderingTierPicker.getRenderTierFor(page) match { | ||
| 122 | + case RemoteRender => log.logger.info("This was a remotely renderable article") | ||
| 123 | + case _ => | ||
| 124 | + } | ||
| 125 | + | ||
| 119 | 126 | val htmlResponse = () => { | |
| 120 | 127 | if (request.isEmail) ArticleEmailHtmlPage.html(article) | |
| 121 | 128 | else if (request.isAmp) views.html.articleAMP(article) | |
@@ -213,6 +220,7 @@ class ArticleController(contentApiClient: ContentApiClient, val controllerCompon | |||
| 213 | 220 | } | |
| 214 | 221 | ||
| 215 | 222 | def renderArticle(path: String): Action[AnyContent] = { | |
| 223 | + | ||
| 216 | 224 | Action.async { implicit request => | |
| 217 | 225 | ||
| 218 | 226 | if(request.isGuui){ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,6 @@ | |||
| 1 | 1 | package services | |
| 2 | 2 | ||
| 3 | + import common.Logging | ||
| 3 | 4 | import controllers.ArticlePage | |
| 4 | 5 | import model.PageWithStoryPackage | |
| 5 | 6 | import model.liveblog.{BodyBlock, ImageBlockElement, TextBlockElement} | |
@@ -48,8 +49,6 @@ object RenderingTierPicker { | |||
| 48 | 49 | ||
| 49 | 50 | def getRenderTierFor(page: PageWithStoryPackage): RenderType = { | |
| 50 | 51 | ||
| 51 | - // todo: clean up | ||
| 52 | - | ||
| 53 | 52 | val canRemotelyRender = isSupportedType(page) && | |
| 54 | 53 | hasBlocks(page) && | |
| 55 | 54 | hasOnlySupportedElements(page) && | |
0 commit comments