LogWriter: Minor improvements

This commit is contained in:
Tal Aloni 2017-03-13 17:52:30 +02:00
parent 359cf7a54c
commit cceae3adf5

View file

@ -21,16 +21,7 @@ namespace SMBServer
public LogWriter() public LogWriter()
{ {
Assembly assembly = Assembly.GetEntryAssembly(); string assemblyDirectory = GetAssemblyDirectory();
if (assembly == null)
{
assembly = Assembly.GetExecutingAssembly();
}
string assemblyDirectory = Path.GetDirectoryName(assembly.Location);
if (!assemblyDirectory.EndsWith(@"\"))
{
assemblyDirectory += @"\";
}
m_logsDirectoryPath = assemblyDirectory + @"Logs\"; m_logsDirectoryPath = assemblyDirectory + @"Logs\";
} }
@ -103,9 +94,24 @@ namespace SMBServer
{ {
if (entry.Severity != Severity.Trace) 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); 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;
}
} }
} }