Skip to content

Commit b048ea6

Browse files
committed
stopped using println and using logger instead
1 parent 87b0e34 commit b048ea6

File tree

4 files changed

+39
-42
lines changed

4 files changed

+39
-42
lines changed

app/actors/ClientSocketActor.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import akka.actor._
33
import actors.PublishSocketMessageActor.{AddOutActor, PublishMessage, StopMessage}
44
import models.EventEnums.EventType
55
import models.{EventJsonSupport, SocketMessage}
6+
import play.api.Logger
67
import spray.json._
78

89
import scala.collection.mutable.HashSet
@@ -22,12 +23,12 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
2223
implicit val messageWrites: Writes[SocketMessage] = Json.writes[SocketMessage]
2324

2425
override def preStart() {
25-
println("pre start called in client", self)
26+
Logger.debug("pre start called in client" + self)
2627
out ! "successfully registered"
2728
}
2829

2930
override def postStop() {
30-
println("post stop called in client", self)
31+
Logger.debug("post stop called in client" + self)
3132
publisher ! StopMessage(self)
3233
}
3334

@@ -36,9 +37,9 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
3637
val json = Json.parse(msg)
3738
val result = json.validate[SocketMessage]
3839
result.fold(
39-
errors => {println("error parsing message to json", msg)},
40+
errors => {Logger.error("error parsing message to json" + msg + " with error " + errors)},
4041
socketMsg => {
41-
println("successfully parsed socket message", socketMsg)
42+
Logger.debug("successfully parsed socket message" + socketMsg)
4243
if (socketMsg.event == EventType.Heartbeat) {
4344
out ! "Heartbeat"
4445
} else {
@@ -48,14 +49,14 @@ class ClientSocketActor(out: ActorRef, publisher: ActorRef) extends Actor with E
4849
)
4950

5051
case SocketMessage(event, payload) =>
51-
println("received socket message in client", SocketMessage)
52+
Logger.debug("received socket message in client" + SocketMessage)
5253
if (!myEvents.contains(event)) {
5354
myEvents += event
5455
publisher ! AddOutActor(self, event)
5556
}
5657

5758
case PublishMessage(msg) =>
58-
println("received publish message in client", self)
59+
Logger.debug("received publish message in client" + self)
5960
out ! msg.toJson(eventFormat).toString()
6061
}
6162

app/actors/PublishSocketMessageActor.scala

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import akka.stream.Materializer
77
import akka.stream.scaladsl.{Flow, Keep, Sink, Source}
88
import models.EventEnums.EventType
99
import models.{EventJsonSupport, RegistryEvent}
10+
import play.api.Logger
1011
import spray.json._
1112

1213
import scala.collection.mutable
@@ -25,15 +26,16 @@ class PublishSocketMessageActor(irBasePath: String, mat: Materializer, actorSys:
2526
val eventActorMap: mutable.HashMap[EventType, ListBuffer[ActorRef]] = new mutable.HashMap[EventType, ListBuffer[ActorRef]]()
2627

2728
override def preStart() {
28-
println("pre start called in publisher", self)
29+
30+
Logger.debug("pre start called in publisher" + self)
2931
val flow: Flow[Message, Message, Promise[Option[Message]]] =
3032
Flow.fromSinkAndSourceMat(
3133
Sink.foreach[Message]{ msg =>
3234
self ! msg},
3335
Source(List(TextMessage("one"), TextMessage("two")))
3436
.concatMat(Source.maybe[Message])(Keep.right))(Keep.right)
3537

36-
val (upgradeResponse, promise) =
38+
3739
Http()(actorSys).singleWebSocketRequest(
3840
WebSocketRequest("ws://" + irBasePath + "/events"),
3941
flow)(mat)
@@ -42,36 +44,35 @@ class PublishSocketMessageActor(irBasePath: String, mat: Materializer, actorSys:
4244
}
4345

4446
override def postStop() {
45-
println("post stop called in publisher", self)
47+
Logger.debug("post stop called in publisher" + self)
4648
}
4749

4850
def receive: PartialFunction[Any, Unit] = {
4951

5052
case StopMessage(toStop) =>
51-
println("stop received", toStop)
53+
Logger.debug("stop received" + toStop)
5254
for ((k, v) <- eventActorMap) v -= toStop
5355

5456
case AddOutActor(out, event) =>
55-
println("received add out actor", out)
57+
Logger.debug("received add out actor" + out)
5658
if (!eventActorMap.contains(event)){
5759
eventActorMap += (event -> new ListBuffer[ActorRef]())
5860
}
5961
eventActorMap(event) += out
6062

6163

6264
case TextMessage.Strict(msg) =>
63-
println("received something ", msg)
65+
Logger.debug("received something " + msg)
6466
val registryEvent = msg.parseJson.convertTo[RegistryEvent](eventFormat)
6567
self ! PublishMessage(registryEvent)
6668

6769
case PublishMessage(msg) =>
68-
println("publish message called with message", msg)
70+
Logger.debug("publish message called with message" + msg)
6971
if(eventActorMap.contains(msg.eventType)){
7072

7173
val list = eventActorMap(msg.eventType)
72-
println("found list in actor map for msg", list)
73-
list.foreach((actor) => {
74-
println("sending message to actor", actor)
74+
list.foreach(actor => {
75+
Logger.debug("sending message to actor" + actor)
7576
actor ! PublishMessage(msg)
7677
})
7778
}

app/controllers/InstanceRegistryController.scala

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,16 @@
1919
package controllers
2020

2121
import akka.actor.{ActorRef, ActorSystem}
22-
import akka.http.scaladsl.Http
23-
import akka.http.scaladsl.model.ws.{Message, TextMessage, WebSocketRequest}
2422
import javax.inject.Inject
2523
import play.api.Configuration
2624

27-
import scala.concurrent.{ExecutionContext, Promise}
25+
import scala.concurrent.ExecutionContext
2826
import play.api.libs.concurrent.CustomExecutionContext
2927
import play.api.libs.ws.WSClient
30-
import play.api.mvc._
3128
import akka.stream.Materializer
32-
import akka.stream.scaladsl.{Flow, Keep, Sink, Source}
3329
import play.api.libs.streams.ActorFlow
3430
import actors.{ClientSocketActor, PublishSocketMessageActor}
35-
36-
import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
31+
import play.api.mvc._
3732

3833

3934
trait MyExecutionContext extends ExecutionContext

client/package-lock.json

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)