Merge remote-tracking branch 'origin/master'

src/Artemis.Core/Ninject/CoreModule.cs

@@ -1,4 +1,6 @@
 using System.IO;
+using System.Security.AccessControl;
+using System.Security.Principal;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
@@ -44,10 +46,6 @@ namespace Artemis.Core.Ninject
 
             Kernel.Bind<LiteRepository>().ToMethod(t =>
             {
-                // Ensure the data folder exists
-                if (!Directory.Exists(Constants.DataFolder))
-                    Directory.CreateDirectory(Constants.DataFolder);
-
                 try
                 {
                     return new LiteRepository(Constants.ConnectionString);

src/Artemis.Core/Plugins/Modules/Module.cs

@@ -91,6 +91,12 @@ namespace Artemis.Core.Plugins.Modules
         /// </summary>
         public bool IsActivated { get; internal set; }
 
+        /// <summary>
+        ///     Gets whether this module's activation was due to an override, can only be true if <see cref="IsActivated" /> is
+        ///     true
+        /// </summary>
+        public bool IsActivatedOverride { get; set; }
+
         /// <summary>
         ///     A list of activation requirements
         ///     <para>Note: if empty the module is always activated</para>
@@ -182,6 +188,7 @@ namespace Artemis.Core.Plugins.Modules
             if (IsActivated)
                 return;
 
+            IsActivatedOverride = isOverride;
             ModuleActivated(isOverride);
             IsActivated = true;
         }
@@ -191,6 +198,7 @@ namespace Artemis.Core.Plugins.Modules
             if (!IsActivated)
                 return;
 
+            IsActivatedOverride = false;
             IsActivated = false;
             ModuleDeactivated(isOverride);
         }

src/Artemis.Core/Services/Interfaces/IModuleService.cs

@@ -8,11 +8,6 @@ namespace Artemis.Core.Services.Interfaces
     /// </summary>
     public interface IModuleService : IArtemisService
     {
-        /// <summary>
-        ///     Gets whether an override is currently being applied
-        /// </summary>
-        bool ApplyingOverride { get; }
-
         /// <summary>
         ///     Gets the current active module override. If set, all other modules are deactivated and only the
         ///     <see cref="ActiveModuleOverride" /> is active.

src/Artemis.Core/Services/ModuleService.cs

@@ -6,6 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
 using Artemis.Core.Events;
+using Artemis.Core.Exceptions;
+using Artemis.Core.Plugins.Exceptions;
 using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Services.Storage.Interfaces;
@@ -17,6 +19,7 @@ namespace Artemis.Core.Services
 {
     internal class ModuleService : IModuleService
     {
+        private static readonly SemaphoreSlim ActiveModuleSemaphore = new SemaphoreSlim(1, 1);
         private readonly ILogger _logger;
         private readonly IModuleRepository _moduleRepository;
         private readonly IPluginService _pluginService;
@@ -37,7 +40,6 @@ namespace Artemis.Core.Services
             PopulatePriorities();
         }
 
-        public bool ApplyingOverride { get; private set; }
         public Module ActiveModuleOverride { get; private set; }
 
         public async Task SetActiveModuleOverride(Module overrideModule)
@@ -45,42 +47,43 @@ namespace Artemis.Core.Services
             if (ActiveModuleOverride == overrideModule)
                 return;
 
+            if (!await ActiveModuleSemaphore.WaitAsync(TimeSpan.FromSeconds(10)))
+                throw new ArtemisCoreException("Timed out while acquiring active module lock");
+
             try
             {
-                // Not the cleanest way but locks don't work async and I cba with a mutex
-                while (ApplyingOverride)
-                    await Task.Delay(50);
-
-                ApplyingOverride = true;
                 ActiveModuleOverride = overrideModule;
 
                 // If set to null, resume regular activation
                 if (ActiveModuleOverride == null)
                 {
-                    await UpdateModuleActivation();
                     _logger.Information("Cleared active module override");
                     return;
                 }
 
                 // If a module was provided, activate it and deactivate everything else
                 var modules = _pluginService.GetPluginsOfType<Module>().ToList();
-                var deactivationTasks = new List<Task>();
+                var tasks = new List<Task>();
                 foreach (var module in modules)
                 {
                     if (module != ActiveModuleOverride)
-                        deactivationTasks.Add(DeactivateModule(module, true));
+                        tasks.Add(DeactivateModule(module, true));
                 }
 
-                await Task.WhenAll(deactivationTasks);
-
                 if (!ActiveModuleOverride.IsActivated)
-                    await ActivateModule(ActiveModuleOverride, true);
+                    tasks.Add(ActivateModule(ActiveModuleOverride, true));
+
+                await Task.WhenAll(tasks);
 
                 _logger.Information($"Set active module override to {ActiveModuleOverride.DisplayName}");
             }
             finally
             {
-                ApplyingOverride = false;
+                ActiveModuleSemaphore.Release();
+
+                // With the semaphore released, trigger an update with the override was cleared
+                if (ActiveModuleOverride == null)
+                    await UpdateModuleActivation();
             }
         }
 
@@ -89,25 +92,35 @@ namespace Artemis.Core.Services
             if (ActiveModuleOverride != null)
                 return;
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            if (!await ActiveModuleSemaphore.WaitAsync(TimeSpan.FromSeconds(10)))
+                throw new ArtemisCoreException("Timed out while acquiring active module lock");
 
-            var modules = _pluginService.GetPluginsOfType<Module>().ToList();
-            var tasks = new List<Task>();
-            foreach (var module in modules)
+            try
             {
-                var shouldBeActivated = module.EvaluateActivationRequirements();
-                if (shouldBeActivated && !module.IsActivated)
-                    tasks.Add(ActivateModule(module, false));
-                else if (!shouldBeActivated && module.IsActivated)
-                    tasks.Add(DeactivateModule(module, false));
+                var stopwatch = new Stopwatch();
+                stopwatch.Start();
+
+                var modules = _pluginService.GetPluginsOfType<Module>().ToList();
+                var tasks = new List<Task>();
+                foreach (var module in modules)
+                {
+                    var shouldBeActivated = module.EvaluateActivationRequirements();
+                    if (shouldBeActivated && !module.IsActivated)
+                        tasks.Add(ActivateModule(module, false));
+                    else if (!shouldBeActivated && module.IsActivated)
+                        tasks.Add(DeactivateModule(module, false));
+                }
+
+                await Task.WhenAll(tasks);
+
+                stopwatch.Stop();
+                if (stopwatch.ElapsedMilliseconds > 100 && !tasks.Any())
+                    _logger.Warning("Activation requirements evaluation took too long: {moduleCount} module(s) in {elapsed}", modules.Count, stopwatch.Elapsed);
+            }
+            finally
+            {
+                ActiveModuleSemaphore.Release();
             }
-
-            await Task.WhenAll(tasks);
-
-            stopwatch.Stop();
-            if (stopwatch.ElapsedMilliseconds > 100)
-                _logger.Warning("Activation requirements evaluation took too long: {moduleCount} module(s) in {elapsed}", modules.Count, stopwatch.Elapsed);
         }
 
         public void UpdateModulePriority(Module module, ModulePriorityCategory category, int priority)
@@ -144,20 +157,36 @@ namespace Artemis.Core.Services
 
         private async Task ActivateModule(Module module, bool isOverride)
         {
-            module.Activate(isOverride);
+            try
+            {
+                module.Activate(isOverride);
 
-            // If this is a profile module, activate the last active profile after module activation
-            if (module is ProfileModule profileModule)
-                await _profileService.ActivateLastProfileAnimated(profileModule);
+                // If this is a profile module, activate the last active profile after module activation
+                if (module is ProfileModule profileModule)
+                    await _profileService.ActivateLastProfileAnimated(profileModule);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(new ArtemisPluginException(module.PluginInfo, "Failed to activate module and last profile.", e), "Failed to activate module and last profile");
+                throw;
+            }
         }
 
         private async Task DeactivateModule(Module module, bool isOverride)
         {
-            // If this is a profile module, activate the last active profile after module activation
-            if (module.IsActivated && module is ProfileModule profileModule)
-                await profileModule.ChangeActiveProfileAnimated(null, null);
+            try
+            {
+                // If this is a profile module, activate the last active profile after module activation
+                if (module.IsActivated && module is ProfileModule profileModule)
+                    await profileModule.ChangeActiveProfileAnimated(null, null);
 
-            module.Deactivate(isOverride);
+                module.Deactivate(isOverride);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(new ArtemisPluginException(module.PluginInfo, "Failed to deactivate module and last profile.", e), "Failed to deactivate module and last profile");
+                throw;
+            }
         }
 
         private void PopulatePriorities()