Skip to content

Commit

Permalink
Comet fix fix
Browse files Browse the repository at this point in the history
AsyncRenderComet should be a MessageCometActor. Use BaseCometActor in
more places.
  • Loading branch information
pbrant committed Jan 27, 2015
1 parent 6ed96fc commit 241335d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
Expand Up @@ -35,12 +35,10 @@ private case class Render(js: JsCmd)
*
* None of these requires explicit use of `buildDeferredFunction`.
*/
class AsyncRenderComet extends CometActor {
class AsyncRenderComet extends MessageCometActor {

override def lifespan: Box[TimeSpan] = Full(90.seconds)

def render = NodeSeq.Empty

// make this method visible so that we can initialize the actor
override def initCometActor(creationInfo: CometCreationInfo) {
super.initCometActor(creationInfo)
Expand Down
4 changes: 2 additions & 2 deletions web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
Expand Up @@ -296,8 +296,8 @@ abstract class LiftActorJWithListenerManager extends LiftActorJ with ListenerMan
*
* @see ListenerManager
*/
trait CometListener extends CometActor {
self: CometActor =>
trait CometListener extends BaseCometActor {
self: BaseCometActor =>

/**
* This controls which Actor to register with for updates. Typically
Expand Down
Expand Up @@ -21,7 +21,7 @@ import util.Helpers._
import common.{Loggable, Full}


trait NamedCometActorTrait extends CometActor with Loggable {
trait NamedCometActorTrait extends BaseCometActor with Loggable {

/**
* First thing we do is registering this comet actor
Expand Down
Expand Up @@ -27,7 +27,7 @@ class NamedCometDispatcher(name: Box[String]) extends LiftActor with Loggable {

logger.debug("DispatcherActor got name: %s".format(name))

private var cometActorsToUpdate: Vector[CometActor]= Vector()
private var cometActorsToUpdate: Vector[BaseCometActor]= Vector()

override def messageHandler = {
/**
Expand Down Expand Up @@ -69,6 +69,6 @@ class NamedCometDispatcher(name: Box[String]) extends LiftActor with Loggable {
* register each named comet actor with a dispatcher that
* only updates the specific version it monitors
*/
case class registerCometActor(actor: CometActor, name: Box[String])
case class unregisterCometActor(actor: CometActor)
case class registerCometActor(actor: BaseCometActor, name: Box[String])
case class unregisterCometActor(actor: BaseCometActor)
case class CometName(name: String)

0 comments on commit 241335d

Please sign in to comment.