From cceae3adf53921eb476888ad9565c70f06ae2618 Mon Sep 17 00:00:00 2001
From: Tal Aloni <tal.aloni.il@gmail.com>
Date: Mon, 13 Mar 2017 17:52:30 +0200
Subject: [PATCH] LogWriter: Minor improvements

---
 SMBServer/LogWriter.cs | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/SMBServer/LogWriter.cs b/SMBServer/LogWriter.cs
index 047790d..601b36d 100644
--- a/SMBServer/LogWriter.cs
+++ b/SMBServer/LogWriter.cs
@@ -21,16 +21,7 @@ namespace SMBServer
 
         public LogWriter()
         {
-            Assembly assembly = Assembly.GetEntryAssembly();
-            if (assembly == null)
-            {
-                assembly = Assembly.GetExecutingAssembly();
-            }
-            string assemblyDirectory = Path.GetDirectoryName(assembly.Location);
-            if (!assemblyDirectory.EndsWith(@"\"))
-            {
-                assemblyDirectory += @"\";
-            }
+            string assemblyDirectory = GetAssemblyDirectory();
             m_logsDirectoryPath = assemblyDirectory + @"Logs\";
         }
 
@@ -103,9 +94,24 @@ namespace SMBServer
         {
             if (entry.Severity != Severity.Trace)
             {
-                string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss ");
+                string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 WriteLine("{0} {1} [{2}] {3}", entry.Severity.ToString().PadRight(12), timestamp, entry.Source, entry.Message);
             }
         }
+
+        public static string GetAssemblyDirectory()
+        {
+            Assembly assembly = Assembly.GetEntryAssembly();
+            if (assembly == null)
+            {
+                assembly = Assembly.GetExecutingAssembly();
+            }
+            string assemblyDirectory = Path.GetDirectoryName(assembly.Location);
+            if (!assemblyDirectory.EndsWith(@"\"))
+            {
+                assemblyDirectory += @"\";
+            }
+            return assemblyDirectory;
+        }
     }
 }