diff options
Diffstat (limited to 'cask/src')
-rw-r--r-- | cask/src/cask/endpoints/WebSocketEndpoint.scala | 12 | ||||
-rw-r--r-- | cask/src/cask/main/Routes.scala | 2 | ||||
-rw-r--r-- | cask/src/cask/package.scala | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala index fcb40ec..d96d6ac 100644 --- a/cask/src/cask/endpoints/WebSocketEndpoint.scala +++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala @@ -32,8 +32,8 @@ class websocket(val path: String, override val subpath: Boolean = false) def wrapPathSegment(s: String): Seq[String] = Seq(s) } -case class WsHandler(f: WsChannelActor => cask.actor.Actor[Ws.Event]) - (implicit ac: cask.actor.Context, log: Logger) +case class WsHandler(f: WsChannelActor => castor.Actor[Ws.Event]) + (implicit ac: castor.Context, log: Logger) extends WebsocketResult with WebSocketConnectionCallback { def onConnect(exchange: WebSocketHttpExchange, channel: WebSocketChannel): Unit = { channel.suspendReceives() @@ -75,8 +75,8 @@ extends WebsocketResult with WebSocketConnectionCallback { } class WsChannelActor(channel: WebSocketChannel) - (implicit ac: cask.actor.Context, log: Logger) -extends cask.actor.SimpleActor[Ws.Event]{ + (implicit ac: castor.Context, log: Logger) +extends castor.SimpleActor[Ws.Event]{ def run(item: Ws.Event): Unit = item match{ case Ws.Text(value) => WebSockets.sendTextBlocking(value, channel) case Ws.Binary(value) => WebSockets.sendBinaryBlocking(ByteBuffer.wrap(value), channel) @@ -87,8 +87,8 @@ extends cask.actor.SimpleActor[Ws.Event]{ } case class WsActor(handle: PartialFunction[Ws.Event, Unit]) - (implicit ac: cask.actor.Context, log: Logger) -extends cask.actor.SimpleActor[Ws.Event]{ + (implicit ac: castor.Context, log: Logger) +extends castor.SimpleActor[Ws.Event]{ def run(item: Ws.Event): Unit = { handle.lift(item) } diff --git a/cask/src/cask/main/Routes.scala b/cask/src/cask/main/Routes.scala index 68e3af4..7b609ee 100644 --- a/cask/src/cask/main/Routes.scala +++ b/cask/src/cask/main/Routes.scala @@ -7,7 +7,7 @@ import language.experimental.macros trait Routes{ def decorators = Seq.empty[cask.router.Decorator[_, _, _]] - implicit val actorContext = new cask.actor.Context.Simple( + implicit val actorContext = new castor.Context.Simple( concurrent.ExecutionContext.Implicits.global, log.exception ) diff --git a/cask/src/cask/package.scala b/cask/src/cask/package.scala index ebba984..27c397c 100644 --- a/cask/src/cask/package.scala +++ b/cask/src/cask/package.scala @@ -54,7 +54,4 @@ package object cask { // util type Logger = util.Logger val Logger = util.Logger - - type BatchActor[T] = actor.BatchActor[T] - } |