Changeset 14261 for branches/thasling/DistributedGA/DistributedGA.Core/Implementation

Timestamp:

08/20/16 10:45:48 (8 years ago)

Author:

thasling

Message:

#2615:
re-enabled log in P2PMigrationAnalyzer
made code formatings

Location:

branches/thasling/DistributedGA/DistributedGA.Core/Implementation

Files:

• PeerNetworkMessageHandler.cs (modified) (6 diffs)
• WcfMessageSender.cs (modified) (2 diffs)
• WcfPeerListManager.cs (modified) (1 diff)

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs

@@ -53 +53 @@
         sender.Init(ownInstance, messageCacheCapacity);
 
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         AddError("PeerNetworkMessageHandler.Init", ex);
       }
@@ -63 +64 @@
         sender.Dispose();
         peerListManager.Dispose();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         AddError("PeerNetworkMessageHandler.Dispose", ex);
       }
@@ -74 +76 @@
           try {
             sender.SendData(peer, data);
-          } catch (Exception ex) {
+          }
+          catch (Exception ex) {
             AddError("PeerNetworkMessageHandler.PublishDataToNetwork(during sending to one peer!)", ex);
           }
         }
 
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         AddError("PeerNetworkMessageHandler.PublishDataToNetwork", ex);
       }
@@ -103 +107 @@
         }
         return res;//.ToArray();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         AddError("PeerNetworkMessageHandler.GetDataFromNetwork", ex);
         return null;
@@ -133 +138 @@
           .Select(ip => ip.ToString())
           .First(str => str.StartsWith(ipPrefix));
-      } catch { return null; }
+      }
+      catch { return null; }
     }
 
@@ -147 +153 @@
     private void AddError(string source, Exception ex) {
       PropagateException(ex);
-      if (peerListManager != null) {
-        try {
-          peerListManager.SendLogToServer(string.Concat("Source: ", source, ", Exception: ", ex.Message));
-        } catch { }
-      }
     }
+
   }
 }

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfMessageSender.cs

@@ -76 +76 @@
 
           Task.WaitAll(runningTasks.ToArray());
-        } finally {
+        }
+        finally {
           isActive = false;
         }
@@ -129 +130 @@
           }
         }
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         //ignore 
         Console.WriteLine(ex.Message);

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

@@ -41 +41 @@
     public List<PeerInfo> GetPeerList() {
       return cachedPeerList;
-    }
-
-    public void SendLogToServer(string msg) {
-      var binding = new NetTcpBinding();
-      var endpoint = new EndpointAddress(serverString);
-      using (var myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint)) {
-        using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
-          ((IContactService)client).MakeLog(myself, msg);
-        }
-      }
     }