From 74d397dd49128040a18302897434c79907d9e2ed Mon Sep 17 00:00:00 2001 From: ErikTromp Date: Tue, 25 Oct 2016 11:47:16 +0200 Subject: [PATCH] Charting allows for more than an object --- conf/application.conf | 2 +- modules/viz/app/tuktu/viz/actor/Charting.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/application.conf b/conf/application.conf index 59e5b467..a4c6a6f0 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -150,7 +150,7 @@ akka { parallelism-factor = 3.0 # Max number of threads to cap factor-based parallelism number to - parallelism-max = 256 + parallelism-max = 1024 # Setting to "FIFO" to use queue like peeking mode which "poll" or "LIFO" to use stack # like peeking mode which "pop". diff --git a/modules/viz/app/tuktu/viz/actor/Charting.scala b/modules/viz/app/tuktu/viz/actor/Charting.scala index b9b12258..c945d1ba 100644 --- a/modules/viz/app/tuktu/viz/actor/Charting.scala +++ b/modules/viz/app/tuktu/viz/actor/Charting.scala @@ -15,6 +15,7 @@ import play.api.Play.current import akka.actor.PoisonPill import scala.concurrent.duration.DurationInt import scala.concurrent.ExecutionContext.Implicits.global +import play.api.libs.json.JsValue case class GetEnumerator() case class EnumeratorReply( @@ -57,7 +58,7 @@ class ChartingActor(name: String, parent: ActorRef, expiration: Long, isHistoric sender ! new EnumeratorReply(enumerator, history.toList) case sh: SetHistorical => historical = sh.historical - case packet: JsObject => { + case packet: JsValue => { lastPacket = System.currentTimeMillis try { // Add to history, then push