AppServer/LocationThread.cs

@@ -22,7 +22,6 @@ namespace AppServer
         private volatile DBsubsOperationManager dbsubsoperManage;
         private volatile DBvehiclesManager dbvehs;
         private DBvehiclesManager DBvehInfo;
-        List<string> blackListAddress = new List<string>();
 
         public static volatile Int32 LocationCheckQueuesCount = 0;
         Int64 count = 0;
@@ -411,12 +410,6 @@ namespace AppServer
 
             if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
             {
-                if (blackListAddress.Contains(mailAdr))
-                {
-                    Utils.WriteLine($" sendMailGeo : The email was not sent. Email address '{mailAdr}' is in blacklist ");
-                    return;
-                }
-
                 try
                 {
                     MailAddress from = new MailAddress(Program.cfg.emailAddress);
@@ -440,10 +433,7 @@ namespace AppServer
                 }
                 catch (Exception ex)
                 {
-                    if (ex.ToString().Contains("timed out"))
-                        blackListAddress.Add(mailAdr);
-
-                    Utils.WriteLine($"Exception in sendMailGeo: {ex.ToString()}");
+                    Console.WriteLine("Exception in sendMailGeo: ", ex.ToString());
                 }
             }
             else
@@ -457,13 +447,6 @@ namespace AppServer
         {
             if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
             {
-
-                if (blackListAddress.Contains(mailAdr))
-                {
-                    Utils.WriteLine($" sendAlarmMail : The email was not sent. Email address '{mailAdr}' is in blacklist ");
-                    return;
-                }
-
                 try
                 {
                     MailAddress from = new MailAddress(Program.cfg.emailAddress);
@@ -475,17 +458,14 @@ namespace AppServer
                 }
                 catch (Exception ex)
                 {
-                    if (ex.ToString().Contains("timed out"))
-                        blackListAddress.Add(mailAdr);
-
                     Utils.WriteLine("Exception in sendMailAlarm2: {0}" + ex.ToString(), ConsoleColor.Red);
                 }
             }
             else
             {
-                Utils.WriteLine("Email Server not Set", ConsoleColor.Cyan);
+                Utils.WriteLine("Email Server not Set",ConsoleColor.Cyan);
             }
-        }
+        }  
 
         private String processZoneAlarm(string radioID, htCell_t cell, bool zone, bool landMArk, string mailAdr, bool sendOnMsgBus)
         {

AppServer/MulticastListener.cs

@@ -28,8 +28,6 @@ namespace AppServer
         private DBvehiclesManager dbvehs;
         internal DBsubsOperationManager dbsubsoperManage;
         private DBcallPatchManager dbCallPatch;
-        private List<string> blackListAddress = new List<string>();
-
         #region code for zone 
         private volatile static ArrayList ZoneList = new ArrayList();
         private volatile static ArrayList LandList = new ArrayList();
@@ -2152,13 +2150,6 @@ namespace AppServer
 
         private void sendAlarmMail(string mes, string mailAdr)
         {
-
-            if (blackListAddress.Contains(mailAdr))
-            {
-                Utils.WriteLine($" sendAlarmMail : The email was not sent. Email address '{mailAdr}' is in blacklist ");
-                return;
-            }
-
             try
             {
                 MailAddress from = new MailAddress(Program.cfg.emailAddress);
@@ -2170,17 +2161,12 @@ namespace AppServer
             }
             catch (Exception ex)
             {
-                if (ex.ToString().Contains("timed out"))
-                    blackListAddress.Add(mailAdr);
-
                 Utils.WriteLine("Exception in sendMailAlarm: " + ex.ToString(), ConsoleColor.Red);
                 //Console.WriteLine(e.ToString());
             }
-        }
+        }        
 
-    
-
-    public void sendDailyReportMail(String PdfFile, string mailAdr)
+        public void sendDailyReportMail(String PdfFile, string mailAdr)
         {
             try
             {