socialnetworknews

commit 8424a1962b1dc480aee922838678f0d32d45fc7c
parent 96239b634565ff4d0431512a567d63039e4ae407
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue,  6 Feb 2018 07:37:32 +0100

Use better Logging

Signed-off-by: MTRNord <mtrnord1@gmail.com>

Diffstat:
M
src/main/resources/logback.xml
 | 
2
+-
M
src/main/scala/Main.scala
 | 
16
+++++-----------
M
src/main/scala/generator/GenerateNewsPaper.scala
 | 
7
++++---
M
src/main/scala/twitterCrawler/StreamingApi.scala
 | 
17
+++++++++--------
M
src/main/scala/webServer/WebServer.scala
 | 
5
+++--

5 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} SNN [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} SNN %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala
@@ -1,15 +1,9 @@
 import com.danielasfregola.twitter4s.entities.enums.AccessType
 import com.danielasfregola.twitter4s.entities.enums.AccessType.AccessType
 import com.danielasfregola.twitter4s.entities.{AccessToken, ConsumerToken}
-import com.danielasfregola.twitter4s.util.Configurations.{
-  consumerTokenKey,
-  consumerTokenSecret
-}
-import com.danielasfregola.twitter4s.{
-  TwitterAuthenticationClient,
-  TwitterRestClient,
-  TwitterStreamingClient
-}
+import com.danielasfregola.twitter4s.util.Configurations.{consumerTokenKey, consumerTokenSecret}
+import com.danielasfregola.twitter4s.{TwitterAuthenticationClient, TwitterRestClient, TwitterStreamingClient}
+import com.typesafe.scalalogging.StrictLogging
 
 import scala.concurrent.{Await, Future}
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -22,7 +16,7 @@ import scala.util.{Failure, Success}
   * @version 0.1.0
   *
   */
-object Main extends App {
+object Main extends App with StrictLogging {
 
   val consumerToken =
     ConsumerToken(key = consumerTokenKey, secret = consumerTokenSecret)
@@ -77,7 +71,7 @@ object Main extends App {
       webServer.WebServer.main()
 
       generator.Scheduler.main()
-    case Failure(err) => println(err.toString)
+    case Failure(err) => logger.error(err.toString)
   }
 
   /**
diff --git a/src/main/scala/generator/GenerateNewsPaper.scala b/src/main/scala/generator/GenerateNewsPaper.scala
@@ -1,10 +1,11 @@
 package generator
 
+import com.typesafe.scalalogging.StrictLogging
 import org.quartz.{Job, JobExecutionContext}
 
-class GenerateNewsPaper extends Job {
-  override def execute(context: JobExecutionContext): Unit = {
+class GenerateNewsPaper extends Job with StrictLogging {
+  def execute(context: JobExecutionContext): Unit = {
     //TODO parse CSV from yesterday and generate Feed
-    println("unimplemented")
+    logger.info("unimplemented")
   }
 }
diff --git a/src/main/scala/twitterCrawler/StreamingApi.scala b/src/main/scala/twitterCrawler/StreamingApi.scala
@@ -10,6 +10,7 @@ import com.danielasfregola.twitter4s.http.clients.streaming.TwitterStream
 import com.danielasfregola.twitter4s.{TwitterRestClient, TwitterStreamingClient}
 import com.github.tototoshi.csv.CSVWriter
 import com.typesafe.config.{Config, ConfigFactory}
+import com.typesafe.scalalogging.StrictLogging
 import org.joda.time.{DateTime, DateTimeZone}
 
 import scala.collection.JavaConverters._
@@ -26,7 +27,7 @@ import scala.concurrent.{Await, Future}
   * @param restClient holds the current Client for the Twitter Rest API
   */
 class StreamingApi(val streamingClient: TwitterStreamingClient,
-                   val restClient: TwitterRestClient) {
+                   val restClient: TwitterRestClient) extends StrictLogging {
   val conf: Config = ConfigFactory.load()
 
   /**
@@ -49,24 +50,24 @@ class StreamingApi(val streamingClient: TwitterStreamingClient,
       trackedWords = trackedWords :+ s
     })
 
-    println(
+    logger.info(
       s"Launching streaming session with tracked keywords: $trackedWords\r\n" +
         s"And with tracked Users: $trackedUsers"
     )
 
     streamingClient.filterStatuses(tracks = trackedWords, follow = trackedUsers) {
       case tweet: Tweet =>
-        println(tweet.text)
+        logger.debug(tweet.text)
         this.saveIDforLater(tweet)
-        println("Done Saving")
+        logger.debug("Done Saving")
       case disconnect: DisconnectMessage =>
-        println("Disconnect: ", disconnect.disconnect)
+        logger.warn("Disconnect: ", disconnect.disconnect)
       case limit: LimitNotice =>
-        println("Limit: ", limit)
+        logger.warn("Limit: ", limit)
       case warning: WarningMessage =>
-        println("Warning: ", warning.warning)
+        logger.warn("Warning: ", warning.warning)
       case default =>
-        println(default)
+        logger.debug(default.toString)
     }
   }
 
diff --git a/src/main/scala/webServer/WebServer.scala b/src/main/scala/webServer/WebServer.scala
@@ -5,10 +5,11 @@ import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.HttpMethods._
 import akka.http.scaladsl.model._
 import akka.stream.ActorMaterializer
+import com.typesafe.scalalogging.StrictLogging
 
 import scala.concurrent.ExecutionContextExecutor
 
-object WebServer {
+object WebServer  extends StrictLogging {
   def main() {
 
     implicit val system: ActorSystem = ActorSystem("FreifunkNews")
@@ -39,7 +40,7 @@ object WebServer {
     val bindingFuture =
       Http().bindAndHandleSync(requestHandler, "localhost", 8080)
 
-    println(s"Server online at http://localhost:8080/")
+    logger.info(s"Server online at http://localhost:8080/")
     bindingFuture
       .flatMap(_.unbind()) // trigger unbinding from the port
       .onComplete(_ => system.terminate()) // and shutdown when done