Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Perpetuum.Bootstrapper/Modules/LoggersModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ protected override void Load(ContainerBuilder builder)
}
};

return new CompositeLogger<LogEvent>(fileLogger, new ColoredConsoleLogger(formater));
if (Environment.UserInteractive)
{
return new CompositeLogger<LogEvent>(fileLogger, new ColoredConsoleLogger(formater));
}
return new CompositeLogger<LogEvent>(fileLogger);
}).As<ILogger<LogEvent>>();

_ = builder.RegisterType<CombatLogger>();
Expand Down
10 changes: 10 additions & 0 deletions src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
using Perpetuum.Zones.Terrains.Terraforming;
using SharpOpenNat;
using System.Numerics;
using System.Reflection;
using System.Runtime;
using System.Runtime.Caching;
using System.Runtime.Versioning;
Expand Down Expand Up @@ -157,6 +158,15 @@ public void Init(string gameRoot)
throw new InvalidOperationException(message);
}

// Get last commit hash
var version = Assembly.GetEntryAssembly()
?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
?.InformationalVersion;
#if DEBUG
Logger.Warning($"DEBUG Version: {version}, UserInteractive: {Environment.UserInteractive}");
#else
Logger.Info($"RELEASE Version: {version}, UserInteractive: {Environment.UserInteractive}");
#endif
Logger.Info($"Game root: {config.GameRoot}");
Logger.Info($"GC isServerGC: {GCSettings.IsServerGC}");
Logger.Info($"GC Latency mode: {GCSettings.LatencyMode}");
Expand Down
38 changes: 18 additions & 20 deletions src/Perpetuum/Log/Loggers/ColoredConsoleLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,36 @@ namespace Perpetuum.Log.Loggers
public class ColoredConsoleLogger : ConsoleLogger<LogEvent>
{
private readonly ConsoleColor _defaultColor = Console.ForegroundColor;
private readonly object _lock = new object();

public ColoredConsoleLogger(ILogEventFormatter<LogEvent, string> formatter) : base(formatter)
{
}

public override void Log(LogEvent logEvent)
{
try
var message = _formatter.Format(logEvent);

lock (_lock)
{
switch (logEvent.LogType)
try
{
case LogType.Warning:
{
switch (logEvent.LogType)
{
case LogType.Warning:
Console.ForegroundColor = ConsoleColor.Yellow;
break;
}
case LogType.Error:
{
{
Console.ForegroundColor = ConsoleColor.Red;
//Console.Beep(4000, 30); I HAET U GOU OWEI
break;
}
}
case LogType.Error:
Console.ForegroundColor = ConsoleColor.Red;
break;
}
Console.Out.WriteLine(message);
}
finally
{
Console.ForegroundColor = _defaultColor;
}

base.Log(logEvent);
}
finally
{
Console.ForegroundColor = _defaultColor;
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Perpetuum/Log/Loggers/ConsoleLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Perpetuum.Log.Loggers
{
public class ConsoleLogger<T> : ILogger<T> where T : ILogEvent
{
private readonly ILogEventFormatter<T,string> _formatter;
protected readonly ILogEventFormatter<T,string> _formatter;

public ConsoleLogger(ILogEventFormatter<T,string> formatter)
{
Expand Down
Loading