Minor tweaks

BenHall · Sep 24, 2010 · ec60849 · ec60849
1 parent 8e668cb
commit ec60849
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/src/PersistentDlr/PersistentDlr.Console/Program.cs b/src/PersistentDlr/PersistentDlr.Console/Program.cs
@@ -1,22 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace PersistentDlr.Console
+namespace PersistentDlr.Console
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            System.Console.WriteLine("Starting...");
+        static void Main(string[] args) {
+            SetTitle("Starting...");
             Agent agent = new Agent();
             agent.Start();
 
-            System.Console.WriteLine("Started");
+            SetTitle("Started");
 
             System.Console.ReadLine();
             agent.Stop();
+
+            SetTitle("Stopped");
+        }
+
+        private static void SetTitle(string title) {
+            System.Console.Title = "PersistentDlr.Console " + title;
+            System.Console.WriteLine(title);
         }
     }
 }
diff --git a/src/PersistentDlr/PersistentDlr/NetworkStreamHandler.cs b/src/PersistentDlr/PersistentDlr/NetworkStreamHandler.cs
@@ -20,10 +20,13 @@ public static string ReadStreamIntoString(NetworkStream ns)
 
             if (ns.CanRead)
             {
-                var recv = ns.Read(data, 0, data.Length);
-                stringData = Encoding.UTF8.GetString(data, 0, recv);
-                stringData = stringData.Trim(new[] { '\r', '\n', '\0' });
-                Console.WriteLine("Got: " + stringData);
+                if (ns.DataAvailable) {
+                    ns.ReadTimeout = 1;
+                    var recv = ns.Read(data, 0, data.Length);
+                    stringData = Encoding.UTF8.GetString(data, 0, recv);
+                    stringData = stringData.Trim(new[] {'\r', '\n', '\0'});
+                    Console.WriteLine("Got: " + stringData);
+                }
             }
 
             return stringData;

diff --git a/src/PersistentDlr/PersistentDlr/RequestHandler.cs b/src/PersistentDlr/PersistentDlr/RequestHandler.cs
@@ -1,4 +1,5 @@
-using System.Net.Sockets;
+using System;
+using System.Net.Sockets;
 using System.Threading;
 using PersistentDlr.Dlr;
 
@@ -26,11 +27,17 @@ public void ProcessConnections()
                     TcpClient client = _server.AcceptTcpClient();
                     NetworkStream ns = client.GetStream();
 
-                    string request = NetworkStreamHandler.ReadStreamIntoString(ns);
+                    try
+                    {
+                        string request = NetworkStreamHandler.ReadStreamIntoString(ns);
 
-                    while (request!= "quit" && client.Connected) {
                         ExecuteRequest(ns, request);
                         request = NetworkStreamHandler.ReadStreamIntoString(ns);
+                        //ns.Close(1000);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine("It's all gone wrong - " + ex.Message);
                     }
 
                     ns.Close();
@@ -43,6 +50,7 @@ public void ProcessConnections()
         private void ExecuteRequest(NetworkStream ns, string request) {
             if (!string.IsNullOrEmpty(request)) {
                 var response = _dlrHost.Execute(request);
+                Console.WriteLine("Result: " + response);
                 WriteResponse(ns, response);
             }
         }