Browse Source

* Add logging timestamp, ref #113

tags/2.3
sin_sin 9 years ago
parent
commit
b10d06dd4b
3 changed files with 28 additions and 2 deletions
  1. +1
    -0
      shadowsocks-csharp/Controller/Local.cs
  2. +26
    -1
      shadowsocks-csharp/Controller/Logging.cs
  3. +1
    -1
      shadowsocks-csharp/Controller/UpdateChecker.cs

+ 1
- 0
shadowsocks-csharp/Controller/Local.cs View File

@@ -61,6 +61,7 @@ namespace Shadowsocks.Controller
public void Stop() public void Stop()
{ {
_listener.Close(); _listener.Close();
// Console.WriteLine("Shadowsocks stopped");
} }


+ 26
- 1
shadowsocks-csharp/Controller/Logging.cs View File

@@ -18,7 +18,7 @@ namespace Shadowsocks.Controller
LogFile = Path.Combine(temppath, "shadowsocks.log"); LogFile = Path.Combine(temppath, "shadowsocks.log");
FileStream fs = new FileStream(LogFile, FileMode.Append); FileStream fs = new FileStream(LogFile, FileMode.Append);
TextWriter tmp = Console.Out; TextWriter tmp = Console.Out;
StreamWriter sw = new StreamWriter(fs);
StreamWriterWithTimestamp sw = new StreamWriterWithTimestamp(fs);
sw.AutoFlush = true; sw.AutoFlush = true;
Console.SetOut(sw); Console.SetOut(sw);
Console.SetError(sw); Console.SetError(sw);
@@ -61,5 +61,30 @@ namespace Shadowsocks.Controller
Console.WriteLine(e); Console.WriteLine(e);
} }
} }
}
// Simply extened System.IO.StreamWriter for adding timestamp workaround
public class StreamWriterWithTimestamp : StreamWriter
{
public StreamWriterWithTimestamp(Stream stream) : base(stream)
{
}
private string GetTimestamp()
{
return "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "] ";
}
public override void WriteLine(string value)
{
base.WriteLine(GetTimestamp() + value);
}
public override void Write(string value)
{
base.Write(GetTimestamp() + value);
}
} }
} }

+ 1
- 1
shadowsocks-csharp/Controller/UpdateChecker.cs View File

@@ -145,7 +145,7 @@ namespace Shadowsocks.Controller
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Write(ex.ToString());
Console.WriteLine(ex.ToString());
return; return;
} }
} }


Loading…
Cancel
Save