Skip to content

Commit

Permalink
Charting allows for more than an object
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikTromp committed Oct 25, 2016
1 parent a05a99c commit 74d397d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down
3 changes: 2 additions & 1 deletion modules/viz/app/tuktu/viz/actor/Charting.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 74d397d

Please sign in to comment.