starting ping from client.

4 files changed, 53 insertions, 59 deletions

diff --git a/code/client/StartServiceBus.cs b/code/client/StartServiceBus.cs
index e7787c9..09ef651 100644
--- a/code/client/StartServiceBus.cs
+++ b/code/client/StartServiceBus.cs
@@ -1,4 +1,5 @@
-using common;

+using System;

+using common;

 using common.messages;

 

 namespace client

@@ -14,6 +15,7 @@ namespace client
                 handler.handler(x);

             });

             Resolve.the<CommandProcessor>().add(receiver);

+            "sending ping {0}".log(DateTime.Now);

             Resolve.the<ServiceBus>().publish<Message>(x =>

             {

                 x.source = "client";

diff --git a/code/common/RequestHandler.cs b/code/common/RequestHandler.cs
index 416988e..fa4c62d 100644
--- a/code/common/RequestHandler.cs
+++ b/code/common/RequestHandler.cs
@@ -16,12 +16,14 @@ namespace common
 

         public override void handle(Message item)

         {

-            "received from {0}: {1} {2}".log(item.source, item.message, DateTime.Now);

+            "received {0} from {1} {2}".log(item.message, item.source, DateTime.Now);

             Thread.Sleep(5000);

+            var source = Assembly.GetEntryAssembly().GetName().Name;

+            "sending  {0} from {1} {2}".log(item.message.Equals("ping") ? "pong" : "ping", source, DateTime.Now);

             bus.publish<Message>(x =>

             {

                 x.message = item.message.Equals("ping") ? "pong" : "ping";

-                x.source = Assembly.GetEntryAssembly().GetName().Name;

+                x.source = source;

             });

         }

     }

diff --git a/code/common/RhinoReceiver.cs b/code/common/RhinoReceiver.cs
index 6bfa9dc..32c4a26 100644
--- a/code/common/RhinoReceiver.cs
+++ b/code/common/RhinoReceiver.cs
@@ -1,47 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Transactions;
-using Rhino.Queues;
-using Rhino.Queues.Model;
-
-namespace common
-{
-    public class RhinoReceiver : Receiver
-    {
-        List<Observer<Message>> observers = new List<Observer<Message>>();
-        IQueue queue;
-        CommandProcessor processor;
-
-        public RhinoReceiver(IQueue queue, CommandProcessor processor)
-        {
-            this.queue = queue;
-            this.processor = processor;
-        }
-
-        public void register(Observer<Message> observer)
-        {
-            observers.Add(observer);
-        }
-
-        public void run()
-        {
-            try
-            {
-                using (var transaction = new TransactionScope())
-                {
-                    var message = queue.Receive();
-                    observers.each(observer => observer(message));
-                    transaction.Complete();
-                }
-            }
-            catch (Exception e)
-            {
-                e.add_to_log();
-            }
-            finally
-            {
-                processor.add(this);
-            }
-        }
-    }
+using System;

+using System.Collections.Generic;

+using System.Transactions;

+using Rhino.Queues;

+using Rhino.Queues.Model;

+

+namespace common

+{

+    public class RhinoReceiver : Receiver

+    {

+        List<Observer<Message>> observers = new List<Observer<Message>>();

+        IQueue queue;

+        CommandProcessor processor;

+

+        public RhinoReceiver(IQueue queue, CommandProcessor processor)

+        {

+            this.queue = queue;

+            this.processor = processor;

+        }

+

+        public void register(Observer<Message> observer)

+        {

+            observers.Add(observer);

+        }

+

+        public void run()

+        {

+            try

+            {

+                using (var transaction = new TransactionScope())

+                {

+                    var message = queue.Receive();

+                    observers.each(observer => observer(message));

+                    transaction.Complete();

+                }

+            }

+            catch (Exception e)

+            {

+                e.add_to_log();

+            }

+            finally

+            {

+                processor.add(this);

+            }

+        }

+    }

 }
\ No newline at end of file
diff --git a/code/server/StartServiceBus.cs b/code/server/StartServiceBus.cs
index 1b3b56e..16a1e0a 100644
--- a/code/server/StartServiceBus.cs
+++ b/code/server/StartServiceBus.cs
@@ -1,5 +1,4 @@
 using common;

-using common.messages;

 

 namespace server

 {

@@ -11,18 +10,9 @@ namespace server
             var handler = new MessageHandler(Resolve.the<DependencyRegistry>());

             receiver.register(x =>

             {

-                //using (var unit_of_work = Resolve.the<IUnitOfWorkFactory>().create())

-                //{

                 handler.handler(x);

-                //unit_of_work.commit();

-                //}

             });

             Resolve.the<CommandProcessor>().add(receiver);

-            Resolve.the<ServiceBus>().publish<Message>(x =>

-            {

-                x.source = "server";

-                x.message = "ping";

-            });

         }

     }

 }
\ No newline at end of file