From 40b78d92549457ac6ada1f3e9661f509726722bf Mon Sep 17 00:00:00 2001
From: CodeForFame <CodeForFame@gmail.com>
Date: Tue, 21 Jun 2011 22:26:18 -0500
Subject: [PATCH] Alerts are now sent on their own thread (one thread for all
 alerts). OSLevelBlocking sends alerts.  The priority is number of blocked ips
 / 10.

---
 .../msc/gs/alert/AlertHandler.scala           | 37 ++++++++++---------
 .../connection/filter/OSLevelBlocking.scala   |  5 ++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala b/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
index af5aae0..66de157 100644
--- a/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
+++ b/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
@@ -10,37 +10,40 @@ import javax.mail.Session
 import javax.mail.internet.MimeMessage
 import javax.mail.Message
 import javax.mail.internet.InternetAddress
+import java.util.concurrent.Executors
 
 /**
  * This is for out-of-game alerts.
  */
 object AlertHandler extends Application {
 
-  private var users : List[User] = Nil
-  
+  private val executor = Executors.newSingleThreadExecutor()
+
+  private var users: List[User] = Nil
+
   load
 
-  def sendAlert(msg : String, recip : String, priority : Int) {
+  def sendAlert(msg: String, recip: String, priority: Int) {
     for (u <- users; if (u.name == recip))
       sendAlert(msg, u, priority)
   }
 
-  private def sendAlert(msg : String, recip : User, priority : Int) {
-    val meds = recip.data.filter(p => p._1 <= priority)
-    for (m <- meds) {
-      Medium.send(m._2, msg)
-    }
+  private def sendAlert(msg: String, recip: User, priority: Int) {
+    executor.execute(new Runnable() {
+      override def run() {
+        val meds = recip.data.filter(p => p._1 <= priority)
+        for (m <- meds) {
+          Medium.send(m._2, msg)
+        }
+      }
+    })
   }
 
-  def sendAlert(msg : String, priority : Int) {
+  def sendAlert(msg: String, priority: Int) {
     for (u <- users)
       sendAlert(msg, u, priority)
   }
 
-  def reload {
-    load
-  }
-
   def load {
     val config = XML.loadFile("alert-config.xml")
     val users1 = (config \\ "user")
@@ -51,7 +54,7 @@ object AlertHandler extends Application {
     users = list.toList
   }
 
-  private def parseUser(u : Node) = {
+  private def parseUser(u: Node) = {
     val name = (u \ "name").text
     val credentials = {
       val map = new HashMap[Int, Medium]
@@ -78,7 +81,7 @@ private object Medium {
     meds += (("email", EMail.send _))
   }
 
-  def send(m : Medium, msg: String) {
+  def send(m: Medium, msg: String) {
     val pf = meds.get(m.identifier).get
     pf(msg, m.recip)
   }
@@ -90,11 +93,11 @@ private class Medium(identifier_ : String, recip_ : String) {
 }
 
 private trait Protocol {
-  def send(msg : String, recip : String)
+  def send(msg: String, recip: String)
 }
 
 private object EMail extends Protocol {
-  override def send(msg : String, recip : String) = {
+  override def send(msg: String, recip: String) = {
     val props = new Properties()
     val config = XML.loadFile("alert-config.xml") \\ "credentials"
     val sender = config \ "user" text
diff --git a/GameServer/src/org/moparscape/msc/gs/connection/filter/OSLevelBlocking.scala b/GameServer/src/org/moparscape/msc/gs/connection/filter/OSLevelBlocking.scala
index 7184431..80119cb 100644
--- a/GameServer/src/org/moparscape/msc/gs/connection/filter/OSLevelBlocking.scala
+++ b/GameServer/src/org/moparscape/msc/gs/connection/filter/OSLevelBlocking.scala
@@ -5,8 +5,9 @@ import java.util.concurrent.CopyOnWriteArrayList
 import org.moparscape.msc.gs.Server
 import org.moparscape.msc.gs.core.DelayedEventHandler
 import org.moparscape.msc.gs.event.DelayedEvent
-import org.moparscape.msc.gs.util.Logger;
+import org.moparscape.msc.gs.util.Logger
 import org.moparscape.msc.config.Config
+import org.moparscape.msc.gs.alert.AlertHandler
 
 object OSLevelBlocking {
 
@@ -27,12 +28,14 @@ object OSLevelBlocking {
             case e: Exception => {
               Logger.error(e)
               Logger.println("Failed to unblock " + ip)
+              AlertHandler.sendAlert("Failed to unblock " + ip, 1);
             }
           }
         }
       })
       Runtime.getRuntime.exec(Config.BLOCK_COMMAND.replaceAll("${ip}", ip));
       blocked.add(ip)
+      AlertHandler.sendAlert("Blocked " + ip, blocked.size / 10);
       Logger.println("Blocked " + ip)
     }
   }