DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Fixed NLog (And my GitHub credentials, hopefully)

Browse Source
This commit is contained in:
SpoinkyNL 2016-05-08 22:42:25 +02:00
parent 39362abb47
commit a09efc6845
6 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Artemis/Artemis/Managers/EffectManager.cs
View File

@ -7,7 +7,6 @@ using Artemis.Modules.Effects.ProfilePreview;
using Artemis.Settings; using Artemis.Settings;
using Caliburn.Micro; using Caliburn.Micro;
using NLog; using NLog;
using LogManager = NLog.LogManager;
namespace Artemis.Managers namespace Artemis.Managers
{ {
@ -16,19 +15,21 @@ namespace Artemis.Managers
/// </summary> /// </summary>
public class EffectManager public class EffectManager
{ {
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly IEventAggregator _events; private readonly IEventAggregator _events;
private readonly KeyboardManager _keyboardManager; private readonly KeyboardManager _keyboardManager;
private readonly ILogger _logger;
private EffectModel _activeEffect; private EffectModel _activeEffect;
public EffectManager(IEventAggregator events, KeyboardManager keyboardManager) public EffectManager(IEventAggregator events, ILogger logger, KeyboardManager keyboardManager)
{ {
Logger.Info("Intializing EffectManager"); _logger = logger;
_logger.Info("Intializing EffectManager");
_events = events; _events = events;
_keyboardManager = keyboardManager; _keyboardManager = keyboardManager;
EffectModels = new List<EffectModel>(); EffectModels = new List<EffectModel>();
Logger.Info("Intialized EffectManager"); _logger.Info("Intialized EffectManager");
} }
/// <summary> /// <summary>
@ -68,7 +69,7 @@ namespace Artemis.Managers
/// <returns>Whether enabling was successful or not.</returns> /// <returns>Whether enabling was successful or not.</returns>
public EffectModel GetLastEffect() public EffectModel GetLastEffect()
{ {
Logger.Debug("Getting last effect: {0}", General.Default.LastEffect); _logger.Debug("Getting last effect: {0}", General.Default.LastEffect);
return General.Default.LastEffect == null return General.Default.LastEffect == null
? null ? null
: EffectModels.FirstOrDefault(e => e.Name == General.Default.LastEffect); : EffectModels.FirstOrDefault(e => e.Name == General.Default.LastEffect);
@ -103,7 +104,7 @@ namespace Artemis.Managers
wasNull = true; wasNull = true;
ActiveEffect = effectModel; ActiveEffect = effectModel;
} }
lock (ActiveEffect) lock (ActiveEffect)
{ {
if (!wasNull) if (!wasNull)
@ -126,7 +127,7 @@ namespace Artemis.Managers
loopManager.Start(); loopManager.Start();
} }
Logger.Debug($"Changed active effect to: {effectModel.Name}"); _logger.Debug($"Changed active effect to: {effectModel.Name}");
} }
@ -147,7 +148,7 @@ namespace Artemis.Managers
} }
} }
Logger.Debug("Cleared active effect"); _logger.Debug("Cleared active effect");
} }
/// <summary> /// <summary>
@ -156,7 +157,7 @@ namespace Artemis.Managers
/// <param name="activeEffect"></param> /// <param name="activeEffect"></param>
public void DisableGame(EffectModel activeEffect) public void DisableGame(EffectModel activeEffect)
{ {
Logger.Debug($"Disabling game: {activeEffect?.Name}"); _logger.Debug($"Disabling game: {activeEffect?.Name}");
if (GetLastEffect() == null) if (GetLastEffect() == null)
ClearEffect(); ClearEffect();
else else

16
Artemis/Artemis/Managers/KeyboardManager.cs
View File

@ -6,7 +6,6 @@ using Artemis.KeyboardProviders;
using Artemis.Settings; using Artemis.Settings;
using Caliburn.Micro; using Caliburn.Micro;
using NLog; using NLog;
using LogManager = NLog.LogManager;
namespace Artemis.Managers namespace Artemis.Managers
{ {
@ -15,18 +14,19 @@ namespace Artemis.Managers
/// </summary> /// </summary>
public class KeyboardManager public class KeyboardManager
{ {
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly IEventAggregator _events; private readonly IEventAggregator _events;
private readonly ILogger _logger;
private KeyboardProvider _activeKeyboard; private KeyboardProvider _activeKeyboard;
public KeyboardManager(IEventAggregator events) public KeyboardManager(IEventAggregator events, ILogger logger)
{ {
Logger.Info("Intializing KeyboardManager"); _logger = logger;
_logger.Info("Intializing KeyboardManager");
_events = events; _events = events;
KeyboardProviders = ProviderHelper.GetKeyboardProviders(); KeyboardProviders = ProviderHelper.GetKeyboardProviders();
Logger.Info("Intialized KeyboardManager"); _logger.Info("Intialized KeyboardManager");
} }
public List<KeyboardProvider> KeyboardProviders { get; set; } public List<KeyboardProvider> KeyboardProviders { get; set; }
@ -47,7 +47,7 @@ namespace Artemis.Managers
/// </summary> /// </summary>
public void EnableLastKeyboard() public void EnableLastKeyboard()
{ {
Logger.Debug($"Enabling last keyboard: {General.Default.LastKeyboard}"); _logger.Debug($"Enabling last keyboard: {General.Default.LastKeyboard}");
if (string.IsNullOrEmpty(General.Default.LastKeyboard)) if (string.IsNullOrEmpty(General.Default.LastKeyboard))
return; return;
@ -76,7 +76,7 @@ namespace Artemis.Managers
lock (ActiveKeyboard) lock (ActiveKeyboard)
{ {
Logger.Debug($"Enabling keyboard: {keyboardProvider.Name}"); _logger.Debug($"Enabling keyboard: {keyboardProvider.Name}");
if (!wasNull) if (!wasNull)
ReleaseActiveKeyboard(); ReleaseActiveKeyboard();
@ -112,7 +112,7 @@ namespace Artemis.Managers
ActiveKeyboard = null; ActiveKeyboard = null;
} }
Logger.Debug($"Released keyboard: {ActiveKeyboard?.Name}"); _logger.Debug($"Released keyboard: {ActiveKeyboard?.Name}");
} }
} }
} }

18
Artemis/Artemis/Managers/LoopManager.cs
View File

@ -14,12 +14,13 @@ namespace Artemis.Managers
private readonly EffectManager _effectManager; private readonly EffectManager _effectManager;
private readonly IEventAggregator _events; private readonly IEventAggregator _events;
private readonly KeyboardManager _keyboardManager; private readonly KeyboardManager _keyboardManager;
private readonly ILogger _logger;
private readonly Timer _loopTimer; private readonly Timer _loopTimer;
public LoopManager(ILogger logger, IEventAggregator events, EffectManager effectManager, public LoopManager(ILogger logger, IEventAggregator events, EffectManager effectManager,
KeyboardManager keyboardManager) KeyboardManager keyboardManager)
{ {
Logger = logger; _logger = logger;
_events = events; _events = events;
_effectManager = effectManager; _effectManager = effectManager;
_keyboardManager = keyboardManager; _keyboardManager = keyboardManager;
@ -29,8 +30,6 @@ namespace Artemis.Managers
_loopTimer.Start(); _loopTimer.Start();
} }
public ILogger Logger { get; }
/// <summary> /// <summary>
/// Gets whether the loop is running /// Gets whether the loop is running
/// </summary> /// </summary>
@ -44,17 +43,18 @@ namespace Artemis.Managers
public void Start() public void Start()
{ {
Logger.Debug("Starting LoopManager"); _logger.Debug("Starting LoopManager");
if (_keyboardManager.ActiveKeyboard == null) if (_keyboardManager.ActiveKeyboard == null)
_keyboardManager.EnableLastKeyboard(); _keyboardManager.EnableLastKeyboard();
// TODO: Deadlock maybe? I don't know what Resharper is on about
if (_effectManager.ActiveEffect == null) if (_effectManager.ActiveEffect == null)
{ {
var lastEffect = _effectManager.GetLastEffect(); var lastEffect = _effectManager.GetLastEffect();
if (lastEffect == null) if (lastEffect == null)
return; return;
_effectManager.ChangeEffect(lastEffect); _effectManager.ChangeEffect(lastEffect);
} }
@ -63,7 +63,7 @@ namespace Artemis.Managers
public void Stop() public void Stop()
{ {
Logger.Debug("Stopping LoopManager"); _logger.Debug("Stopping LoopManager");
Running = false; Running = false;
_keyboardManager.ReleaseActiveKeyboard(); _keyboardManager.ReleaseActiveKeyboard();
@ -77,9 +77,9 @@ namespace Artemis.Managers
// Stop if no active keyboard/efffect // Stop if no active keyboard/efffect
if (_keyboardManager.ActiveKeyboard == null || _effectManager.ActiveEffect == null) if (_keyboardManager.ActiveKeyboard == null || _effectManager.ActiveEffect == null)
{ {
Logger.Debug("No active keyboard/effect, stopping. " + _logger.Debug("No active keyboard/effect, stopping. " +
$"Keyboard={_keyboardManager.ActiveKeyboard?.Name}, " + $"Keyboard={_keyboardManager.ActiveKeyboard?.Name}, " +
$"effect={_effectManager.ActiveEffect?.Name}"); $"effect={_effectManager.ActiveEffect?.Name}");
Stop(); Stop();
return; return;
} }

16
Artemis/Artemis/Managers/MainManager.cs
View File

@ -24,16 +24,17 @@ namespace Artemis.Managers
public delegate void PauseCallbackHandler(); public delegate void PauseCallbackHandler();
private readonly IEventAggregator _events; private readonly IEventAggregator _events;
private readonly ILogger _logger;
public MainManager(IEventAggregator events, ILogger logger, LoopManager loopManager, public MainManager(IEventAggregator events, ILogger logger, LoopManager loopManager,
KeyboardManager keyboardManager, EffectManager effectManager) KeyboardManager keyboardManager, EffectManager effectManager)
{ {
Logger = logger; _logger = logger;
LoopManager = loopManager; LoopManager = loopManager;
KeyboardManager = keyboardManager; KeyboardManager = keyboardManager;
EffectManager = effectManager; EffectManager = effectManager;
Logger.Info("Intializing MainManager"); _logger.Info("Intializing MainManager");
_events = events; _events = events;
@ -58,13 +59,12 @@ namespace Artemis.Managers
PipeServer = new PipeServer(); PipeServer = new PipeServer();
PipeServer.Start("artemis"); PipeServer.Start("artemis");
Logger.Info("Intialized MainManager"); _logger.Info("Intialized MainManager");
} }
[Inject] [Inject]
public Lazy<ShellViewModel> ShellViewModel { get; set; } public Lazy<ShellViewModel> ShellViewModel { get; set; }
public ILogger Logger { get; }
public LoopManager LoopManager { get; } public LoopManager LoopManager { get; }
public KeyboardManager KeyboardManager { get; set; } public KeyboardManager KeyboardManager { get; set; }
public EffectManager EffectManager { get; set; } public EffectManager EffectManager { get; set; }
@ -80,7 +80,7 @@ namespace Artemis.Managers
public void Dispose() public void Dispose()
{ {
Logger.Debug("Shutting down MainManager"); _logger.Debug("Shutting down MainManager");
LoopManager.Stop(); LoopManager.Stop();
ProcessWorker.CancelAsync(); ProcessWorker.CancelAsync();
ProcessWorker.CancelAsync(); ProcessWorker.CancelAsync();
@ -93,7 +93,7 @@ namespace Artemis.Managers
/// </summary> /// </summary>
public void EnableProgram() public void EnableProgram()
{ {
Logger.Debug("Enabling program"); _logger.Debug("Enabling program");
ProgramEnabled = true; ProgramEnabled = true;
LoopManager.Start(); LoopManager.Start();
_events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled)); _events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled));
@ -104,7 +104,7 @@ namespace Artemis.Managers
/// </summary> /// </summary>
public void DisableProgram() public void DisableProgram()
{ {
Logger.Debug("Disabling program"); _logger.Debug("Disabling program");
LoopManager.Stop(); LoopManager.Stop();
ProgramEnabled = false; ProgramEnabled = false;
_events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled)); _events.PublishOnUIThread(new ToggleEnabled(ProgramEnabled));
@ -150,7 +150,7 @@ namespace Artemis.Managers
if (e.Error == null) if (e.Error == null)
return; return;
Logger.Error(e.Error, "Exception in the BackgroundWorker"); _logger.Error(e.Error, "Exception in the BackgroundWorker");
throw e.Error; throw e.Error;
} }
} }

33
Artemis/Artemis/NLog.config
View File

@ -5,38 +5,13 @@
autoReload="true" autoReload="true"
throwExceptions="false" throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" > internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
<!-- optional, add some variabeles
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets> <targets>
<target name="file" xsi:type="File" maxArchiveFiles="7" fileName="${specialfolder:folder=MyDocuments}/Artemis/logs/${shortdate}.txt"/>
<!-- <target name="debugger" xsi:type="Debugger" layout="${logger:shortName=True} - ${uppercase:${level}}: ${message}"/>
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets> </targets>
<rules> <rules>
<!-- add your logging rules here --> <logger name="*" minlevel="Debug" writeTo="file" />
<logger name="*" minlevel="Debug" writeTo="debugger" />
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules> </rules>
</nlog> </nlog>

1
Artemis/Artemis/ViewModels/Abstract/GameViewModel.cs
View File

@ -34,6 +34,7 @@ namespace Artemis.ViewModels.Abstract
[Inject] [Inject]
public ProfilePreviewModel ProfilePreviewModel { get; set; } public ProfilePreviewModel ProfilePreviewModel { get; set; }
public IEventAggregator Events { get; set; } public IEventAggregator Events { get; set; }
public IProfileEditorViewModelFactory PFactory { get; set; } public IProfileEditorViewModelFactory PFactory { get; set; }