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

Tidy class definition and logging · devhttps/frontend@bd589c6 · GitHub

Commit bd589c6

Browse files
Richard Nguyen
committed
Tidy class definition and logging
1 parent ce8d6dd commit bd589c6

1 file changed

Lines changed: 18 additions & 23 deletions

File tree

‎diagnostics/app/controllers/CommercialPreflightController.scala‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,16 @@ import java.lang.Long.{toString => toStringBase}
1212
import scala.util.{Success, Failure, Random}
1313

1414
case class AdRequest(
15-
load_id: String, // load_id
16-
zone_ids: List[Int], // zone_ids
17-
/*
18-
19-
229 970x250, 728x90
20-
228 300x250
21-
22-
*/
23-
ip: String, // ip
24-
user_agent: String, // user_agent
25-
url: String, // url
26-
referrer: Option[String], // referrer
27-
browser_dimensions: Option[String], // browser_dimensions
15+
load_id: String,
16+
zone_ids: List[Int],
17+
ip: String,
18+
user_agent: String,
19+
url: String,
20+
referrer: Option[String],
21+
browser_dimensions: Option[String],
2822
switch_user_id: Option[String], // switch_user_id, SWID cookie
29-
floor_price: Option[String], // floor_price
30-
targeting_variables: Option[String] // targeting_variables
23+
floor_price: Option[String],
24+
targeting_variables: Option[String]
3125
)
3226

3327
object AdRequest {
@@ -48,7 +42,6 @@ class CommercialPreflightController(wsClient: WSClient) extends Controller with
4842
val pageViewId = makeOphanViewId()
4943

5044
val switchId = request.headers.get("X-GU-switch-id")
51-
5245
val maybeClientIp = request.headers.get("X-GU-client-ip")
5346
val maybeTopUrl = request.headers.get("X-GU-topurl")
5447
val maybeUserAgent = request.headers.get("X-GU-user-agent")
@@ -58,9 +51,13 @@ class CommercialPreflightController(wsClient: WSClient) extends Controller with
5851
topUrl <- maybeTopUrl
5952
userAgent <- maybeUserAgent
6053
} {
61-
val adHubRequest = AdRequest(
54+
val adHubRequest = Json.toJson(AdRequest(
6255
load_id = pageViewId,
6356
zone_ids = List(229, 228),
57+
/* id sizes
58+
229 970x250, 728x90
59+
228 300x250
60+
*/
6461
ip = clientIp,
6562
user_agent = userAgent,
6663
url = topUrl,
@@ -69,14 +66,12 @@ class CommercialPreflightController(wsClient: WSClient) extends Controller with
6966
switch_user_id = switchId,
7067
floor_price = None,
7168
targeting_variables = None
72-
)
73-
74-
log.logger.info(Json.toJson(adHubRequest).toString())
69+
))
7570

76-
wsClient.url(Configuration.commercial.switchAdHubUrl)
77-
.post(Json.toJson(adHubRequest))
71+
wsClient.url(Configuration.switch.switchAdHubUrl)
72+
.post(adHubRequest)
7873
.onComplete({
79-
case Success(_) => log.logger.debug(s"switch ad call success for $clientIp, ${switchId.getOrElse("unknown user id")}")
74+
case Success(_) => log.logger.debug(s"switch ad call success for ${adHubRequest.toString()}, ${switchId.getOrElse("unknown user id")}")
8075
case Failure(e) => log.logger.warn(s"switch ad call failed: ${e.getMessage}")
8176
})
8277
}

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL