From 34ab7d9450ff2a977d63cd32bf7343c69d177eac Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 8 Sep 2012 10:48:01 +0100 Subject: [PATCH] listener: remove some unused code --- SparkleLib/SparkleListenerBase.cs | 16 ++-------------- SparkleLib/SparkleRepoBase.cs | 4 ++-- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index 222f595b..7656f135 100755 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -50,7 +50,6 @@ namespace SparkleLib { new Dictionary> (); private Dictionary queue_up = new Dictionary (); - private Dictionary queue_down = new Dictionary (); private Timer reconnect_timer = new Timer { Interval = 60 * 1000, @@ -130,8 +129,6 @@ namespace SparkleLib { SparkleAnnouncement announcement = item.Value; Announce (announcement); } - - this.queue_down.Clear (); } } @@ -148,19 +145,10 @@ namespace SparkleLib { SparkleLogger.LogInfo ("Listener", "Got message " + announcement.Message + " from " + announcement.FolderIdentifier + " on " + Server); - if (IsRecentAnnouncement (announcement)) { - SparkleLogger.LogInfo ("Listener", "Ignoring previously processed message " + announcement.Message + - " from " + announcement.FolderIdentifier + " on " + Server); - - return; - } - - SparkleLogger.LogInfo ("Listener", "Processing message " + announcement.Message + " from " + - announcement.FolderIdentifier + " on " + Server); + if (IsRecentAnnouncement (announcement)) + return; AddRecentAnnouncement (announcement); - this.queue_down [announcement.FolderIdentifier] = announcement; - AnnouncementReceived (announcement); } diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index 2b6969f6..7eee1268 100755 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -451,12 +451,12 @@ namespace SparkleLib { while (this.is_syncing) Thread.Sleep (100); - SparkleLogger.LogInfo ("Listener", "Syncing due to announcement"); + SparkleLogger.LogInfo (Name, "Syncing due to announcement"); SyncDownBase (); } else { if (announcement.FolderIdentifier.Equals (identifier)) - SparkleLogger.LogInfo ("Listener", "Not syncing, message is for current revision"); + SparkleLogger.LogInfo (Name, "Not syncing, message is for current revision"); } }