From deb054b6fb65de0f689f1f6ae4cb326212110144 Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 25 Mar 2016 12:11:05 +0100 Subject: [PATCH] Fixed License [skip ci] --- Greenshot/Helpers/ResourceMutex.cs | 118 +++++++++++++---------------- 1 file changed, 54 insertions(+), 64 deletions(-) diff --git a/Greenshot/Helpers/ResourceMutex.cs b/Greenshot/Helpers/ResourceMutex.cs index becab8262..ae5e12bc6 100644 --- a/Greenshot/Helpers/ResourceMutex.cs +++ b/Greenshot/Helpers/ResourceMutex.cs @@ -1,26 +1,25 @@ -/* - Dapplo - building blocks for desktop applications - Copyright (C) 2015-2016 Dapplo - - For more information see: http://dapplo.net/ - Dapplo repositories are hosted on GitHub: https://github.com/dapplo - - This file is part of Dapplo.Addons - - Dapplo.Addons is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Dapplo.Addons is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Dapplo.Addons. If not, see . - */ +// Dapplo - building blocks for desktop applications +// Copyright (C) 2015-2016 Dapplo +// +// For more information see: http://dapplo.net/ +// Dapplo repositories are hosted on GitHub: https://github.com/dapplo +// +// This file is part of Dapplo.Addons +// +// Dapplo.Addons is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Dapplo.Addons is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have Config a copy of the GNU Lesser General Public License +// along with Dapplo.Addons. If not, see . +#region using using log4net; using System; @@ -28,31 +27,24 @@ using System.Security.AccessControl; using System.Security.Principal; using System.Threading; +#endregion + namespace Greenshot.Helpers { /// - /// This comes from Dapplo.Addons, which was created for Greenshot, this file is copied here as this is the only part we use in 1.2.8 - /// This protects your resources or application from running more than once - /// Simplifies the usage of the Mutex class, as described here: https://msdn.microsoft.com/en-us/library/System.Threading.Mutex.aspx + /// This protects your resources or application from running more than once + /// Simplifies the usage of the Mutex class, as described here: + /// https://msdn.microsoft.com/en-us/library/System.Threading.Mutex.aspx /// public class ResourceMutex : IDisposable { - private static ILog LOG = LogManager.GetLogger(typeof(DestinationHelper)); + private static readonly ILog Log = LogManager.GetLogger(typeof(DestinationHelper)); private readonly string _mutexId; private readonly string _resourceName; private Mutex _applicationMutex; /// - /// Test if the Mutex was created and locked. - /// - public bool IsLocked - { - get; - set; - } - - /// - /// Private constructor + /// Private constructor /// /// /// @@ -63,7 +55,12 @@ namespace Greenshot.Helpers } /// - /// Create a ResourceMutex for the specified mutex id and resource-name + /// Test if the Mutex was created and locked. + /// + public bool IsLocked { get; set; } + + /// + /// Create a ResourceMutex for the specified mutex id and resource-name /// /// ID of the mutex, preferably a Guid as string /// Name of the resource to lock, e.g your application name, usefull for logs @@ -76,12 +73,12 @@ namespace Greenshot.Helpers } /// - /// This tries to get the Mutex, which takes care of having multiple instances running + /// This tries to get the Mutex, which takes care of having multiple instances running /// /// true if it worked, false if another instance is already running or something went wrong public bool Lock() { - LOG.DebugFormat("{0} is trying to get Mutex {1}", _resourceName, _mutexId); + Log.DebugFormat("{0} is trying to get Mutex {1}", _resourceName, _mutexId); IsLocked = true; // check whether there's an local instance running already, but use local so this works in a multi-user environment @@ -100,7 +97,7 @@ namespace Greenshot.Helpers // 2) if the mutex wasn't created new get the right to it, this returns false if it's already locked if (!createdNew && !_applicationMutex.WaitOne(100, false)) { - LOG.InfoFormat("{0} is already in use, mutex {1} is NOT locked for the caller", _resourceName, _mutexId); + Log.InfoFormat("{0} is already in use, mutex {1} is NOT locked for the caller", _resourceName, _mutexId); IsLocked = false; // Clean up _applicationMutex.Close(); @@ -108,45 +105,38 @@ namespace Greenshot.Helpers } else { - if (createdNew) - { - LOG.InfoFormat("{0} has created & claimed the mutex {1}", _resourceName, _mutexId); - } - else - { - LOG.InfoFormat("{0} has claimed the mutex {1}", _resourceName, _mutexId); - - } + Log.InfoFormat(createdNew ? "{0} has created & claimed the mutex {1}" : "{0} has claimed the mutex {1}", _resourceName, _mutexId); } } catch (AbandonedMutexException e) { // Another instance didn't cleanup correctly! // we can ignore the exception, it happend on the "waitone" but still the mutex belongs to us - LOG.WarnFormat("{0} didn't cleanup correctly, but we got the mutex {1}.", _resourceName, _mutexId); - LOG.Warn(e); + Log.WarnFormat("{0} didn't cleanup correctly, but we got the mutex {1}.", _resourceName, _mutexId); + Log.Warn(e); } catch (UnauthorizedAccessException e) { - LOG.ErrorFormat("{0} is most likely already running for a different user in the same session, can't create/get mutex {1} due to error.", _resourceName, _mutexId); - LOG.Error(e); + Log.ErrorFormat("{0} is most likely already running for a different user in the same session, can't create/get mutex {1} due to error.", _resourceName, _mutexId); + Log.Error(e); IsLocked = false; } catch (Exception ex) { - LOG.ErrorFormat("Problem obtaining the Mutex {1} for {0}, assuming it was already taken!", _resourceName, _mutexId); - LOG.Error(ex); + Log.ErrorFormat("Problem obtaining the Mutex {1} for {0}, assuming it was already taken!", _resourceName, _mutexId); + Log.Error(ex); IsLocked = false; } return IsLocked; } #region IDisposable Support + // To detect redundant Dispose calls - private bool _disposedValue = false; + private bool _disposedValue; /// - /// The real disposing code + /// The real disposing code /// /// true if dispose is called, false when the finalizer is called protected virtual void Dispose(bool disposing) @@ -159,21 +149,20 @@ namespace Greenshot.Helpers { _applicationMutex.ReleaseMutex(); _applicationMutex = null; - LOG.InfoFormat("Released Mutex {0} for {1}", _mutexId, _resourceName); + Log.InfoFormat("Released Mutex {0} for {1}", _mutexId, _resourceName); } catch (Exception ex) { - LOG.ErrorFormat("Error releasing Mutex {0} for {1}", _mutexId, _resourceName); - LOG.Error(ex); + Log.ErrorFormat("Error releasing Mutex {0} for {1}", _mutexId, _resourceName); + Log.Error(ex); } - } _disposedValue = true; } } /// - /// Make sure the ApplicationMutex is disposed when the finalizer is called + /// Make sure the ApplicationMutex is disposed when the finalizer is called /// ~ResourceMutex() { @@ -182,7 +171,7 @@ namespace Greenshot.Helpers } /// - /// The dispose interface, which calls Dispose(true) to signal that dispose is called. + /// The dispose interface, which calls Dispose(true) to signal that dispose is called. /// public void Dispose() { @@ -190,6 +179,7 @@ namespace Greenshot.Helpers Dispose(true); GC.SuppressFinalize(this); } + #endregion } -} +} \ No newline at end of file