Separating system and task logs

NuGet.Config

@@ -3,6 +3,5 @@
   <packageSources>
     <add key="Octopus Dependencies" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
     <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
-    <add key="ASPNET Code MyGet" value="https://dotnet.myget.org/F/dotnet-core/" />
   </packageSources>
 </configuration>

source/DirectoryServices.Tests/ActiveDirectoryMembershipTests.cs

@@ -14,7 +14,7 @@ public class ActiveDirectoryMembershipTests
         [TestCase("EXAMPLE\\joe", "joe", "EXAMPLE")]
         public void CredentialsAreNormalized(string rawUsername, string usedUsername, string usedDomain)
         {
-            var log = Substitute.For<ILog>();
+            var log = Substitute.For<ISystemLog>();
             var credentialNormalizer = new DirectoryServicesObjectNameNormalizer(log);
             var domainUser = credentialNormalizer.NormalizeName(rawUsername);
             Assert.AreEqual(usedUsername, domainUser.NormalizedName);

source/DirectoryServices.Tests/CredentialValidatorTests.cs

@@ -38,7 +38,7 @@ public void SetUp()
 
             directoryServicesService = Substitute.For<IDirectoryServicesService>();
 
-            var log = Substitute.For<ILog>();
+            var log = Substitute.For<ISystemLog>();
 
             identityCreator = new IdentityCreator();
 

source/DirectoryServices.Tests/DirectoryServicesExternalSecurityGroupLocatorTests.cs

@@ -18,12 +18,12 @@ public class DirectoryServicesExternalSecurityGroupLocatorTests
 
         DirectoryServicesExternalSecurityGroupLocator locator;
         IUserPrincipalFinder userPrincipalFinder;
-        InMemoryLog log;
+        ISystemLog log;
 
         [SetUp]
         public void SetUp()
         {
-            log = new InMemoryLog();
+            log = Substitute.For<ISystemLog>();
             var configurationStore = Substitute.For<IDirectoryServicesConfigurationStore>();
 
             var contextProvider = Substitute.For<IDirectoryServicesContextProvider>();
@@ -33,48 +33,50 @@ public void SetUp()
             var directoryServicesObjectNameNormalizer = Substitute.For<IDirectoryServicesObjectNameNormalizer>();
             directoryServicesObjectNameNormalizer.NormalizeName(Arg.Any<string>())
                 .Returns(x => new DomainUser(null, ((string)x.Args()[0])));
-            
+
             locator = new DirectoryServicesExternalSecurityGroupLocator(
                 log,
                 contextProvider,
                 directoryServicesObjectNameNormalizer,
                 configurationStore,
                 userPrincipalFinder
             );
-            
+
             configurationStore.GetAreSecurityGroupsEnabled().Returns(true);
             contextProvider.GetContext(null).ReturnsForAnyArgs(new PrincipalContext(ContextType.Machine));
-
         }
-        
+
         [Test]
         public void GetGroupIdsForUser_NotFound()
         {
             userPrincipalFinder.FindByIdentity(null, null).ReturnsForAnyArgs((IUserPrincipalWrapper) null);
-                
+
             var result = locator.GetGroupIdsForUser("Bob", CancellationToken.None);
             result.WasAbleToRetrieveGroups.ShouldBeFalse();
-            
-            log.Logs.ShouldContain((LogCategory.Trace, null, $"While loading security groups, a principal identifiable by 'Bob' was not found in '{Environment.MachineName}'"));
+
+            log.Received().Trace($"While loading security groups, a principal identifiable by 'Bob' was not found in '{Environment.MachineName}'");
         }
-        
+
         [Test]
         public void GetGroupIdsForUser_ErrorGettingAuthorizationGroups()
         {
-            
+
             var userPrincipal = Substitute.For<IUserPrincipalWrapper>();
             userPrincipalFinder.FindByIdentity(null, null).ReturnsForAnyArgs(userPrincipal);
 
             var authGroupsException = new Exception("AuthorizationGroups Exception");
             userPrincipal.GetAuthorizationGroups(CancellationToken.None).ThrowsForAnyArgs(authGroupsException);
             userPrincipal.GetGroups(CancellationToken.None).Returns(new[] {new FakeGroupPrincipal(groupSid)});
-                
+
             var result = locator.GetGroupIdsForUser("Bob", CancellationToken.None);
             result.WasAbleToRetrieveGroups.ShouldBeTrue();
             result.GroupsIds.ShouldBe(new[] { groupSid});
-
-            log.Logs.ShouldContain(l => l.category == LogCategory.Verbose && l.exception == authGroupsException);
-            log.Logs.ShouldNotContain(l => l.category == LogCategory.Error || l.category == LogCategory.Fatal);
+
+            log.Received().Verbose(authGroupsException);
+            log.DidNotReceive().Error(Arg.Any<string>());
+            log.DidNotReceive().Error(Arg.Any<Exception>());
+            log.DidNotReceive().Fatal(Arg.Any<string>());
+            log.DidNotReceive().Fatal(Arg.Any<Exception>());
         }
 
         [Test]
@@ -85,34 +87,37 @@ public void GetGroupIdsForUser_ErrorGettingAnyGroups()
 
             var authGroupsException = new Exception("AuthorizationGroups Exception");
             userPrincipal.GetAuthorizationGroups(CancellationToken.None).ThrowsForAnyArgs(authGroupsException);
-            
+
             var groupsException = new Exception("Groups Exception");
             userPrincipal.GetGroups(CancellationToken.None).ThrowsForAnyArgs(groupsException);
-                
+
             var result = locator.GetGroupIdsForUser("Bob", CancellationToken.None);
-            
+
             result.WasAbleToRetrieveGroups.ShouldBeFalse();
             result.GroupsIds.ShouldBeNull();
-     
-            log.Logs.ShouldContain(l => l.category == LogCategory.Verbose && l.exception == authGroupsException);
-            log.Logs.ShouldContain(l => l.category == LogCategory.Error && l.exception == groupsException);
+
+            log.Received().Verbose(authGroupsException);
+            log.Received().ErrorFormat(groupsException, "Active Directory search for {0} failed.", "Bob");
         }
-        
+
         [Test]
         public void GetGroupIdsForUser_Success()
         {
-            
+
             var userPrincipal = Substitute.For<IUserPrincipalWrapper>();
             userPrincipalFinder.FindByIdentity(null, null).ReturnsForAnyArgs(userPrincipal);
 
             userPrincipal.GetAuthorizationGroups(CancellationToken.None).ReturnsForAnyArgs(new[] {new FakeGroupPrincipal(groupSid)});
-            
+
             var result = locator.GetGroupIdsForUser("Bob", CancellationToken.None);
-            
+
             result.WasAbleToRetrieveGroups.ShouldBeTrue();
             result.GroupsIds.ShouldBe(new[] { groupSid});
-            log.Logs.ShouldNotContain(l => l.category == LogCategory.Error || l.category == LogCategory.Fatal);
 
+            log.DidNotReceive().Error(Arg.Any<string>());
+            log.DidNotReceive().Error(Arg.Any<Exception>());
+            log.DidNotReceive().Fatal(Arg.Any<string>());
+            log.DidNotReceive().Fatal(Arg.Any<Exception>());
         }
 
         class FakeGroupPrincipal : IPrincipalWrapper

source/Server/Configuration/DatabaseInitializer.cs

@@ -10,13 +10,13 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Configur
 {
     class DatabaseInitializer : ExecuteWhenDatabaseInitializes
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly IConfigurationStore configurationStore;
         readonly IWritableKeyValueStore settings;
 
         bool cleanupRequired = false;
 
-        public DatabaseInitializer(ILog log, IConfigurationStore configurationStore, IWritableKeyValueStore settings)
+        public DatabaseInitializer(ISystemLog log, IConfigurationStore configurationStore, IWritableKeyValueStore settings)
         {
             this.log = log;
             this.configurationStore = configurationStore;

source/Server/Configuration/DirectoryServicesConfigureCommands.cs

@@ -8,11 +8,11 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Configur
 {
     class DirectoryServicesConfigureCommands : IContributeToConfigureCommand
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly Lazy<IDirectoryServicesConfigurationStore> activeDirectoryConfiguration;
 
         public DirectoryServicesConfigureCommands(
-            ILog log,
+            ISystemLog log,
             Lazy<IDirectoryServicesConfigurationStore> activeDirectoryConfiguration)
         {
             this.log = log;

source/Server/DirectoryServices/DirectoryServicesCredentialValidator.cs

@@ -14,7 +14,7 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Director
 {
     class DirectoryServicesCredentialValidator : IDirectoryServicesCredentialValidator
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly IDirectoryServicesObjectNameNormalizer objectNameNormalizer;
         readonly IUpdateableUserStore userStore;
         readonly IDirectoryServicesConfigurationStore configurationStore;
@@ -24,7 +24,7 @@ class DirectoryServicesCredentialValidator : IDirectoryServicesCredentialValidat
         internal static string EnvironmentUserDomainName = Environment.UserDomainName;
 
         public DirectoryServicesCredentialValidator(
-            ILog log,
+            ISystemLog log,
             IDirectoryServicesObjectNameNormalizer objectNameNormalizer,
             IUpdateableUserStore userStore,
             IDirectoryServicesConfigurationStore configurationStore,

source/Server/DirectoryServices/DirectoryServicesExternalSecurityGroupLocator.cs

@@ -13,14 +13,14 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Director
 {
     class DirectoryServicesExternalSecurityGroupLocator : IDirectoryServicesExternalSecurityGroupLocator
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly IDirectoryServicesContextProvider contextProvider;
         readonly IDirectoryServicesObjectNameNormalizer objectNameNormalizer;
         readonly IDirectoryServicesConfigurationStore configurationStore;
         readonly IUserPrincipalFinder userPrincipalFinder;
 
         public DirectoryServicesExternalSecurityGroupLocator(
-            ILog log,
+            ISystemLog log,
             IDirectoryServicesContextProvider contextProvider,
             IDirectoryServicesObjectNameNormalizer objectNameNormalizer,
             IDirectoryServicesConfigurationStore configurationStore,

source/Server/DirectoryServices/DirectoryServicesObjectNameNormalizer.cs

@@ -5,10 +5,10 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Director
 {
     class DirectoryServicesObjectNameNormalizer : IDirectoryServicesObjectNameNormalizer
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         const string NTAccountUsernamePrefix = "nt:";
 
-        public DirectoryServicesObjectNameNormalizer(ILog log)
+        public DirectoryServicesObjectNameNormalizer(ISystemLog log)
         {
             this.log = log;
         }

source/Server/DirectoryServices/DirectoryServicesService.cs

@@ -9,7 +9,7 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Director
 {
     class DirectoryServicesService : IDirectoryServicesService
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly IDirectoryServicesObjectNameNormalizer objectNameNormalizer;
         readonly IDirectoryServicesContextProvider contextProvider;
 
@@ -27,7 +27,7 @@ class DirectoryServicesService : IDirectoryServicesService
         /// </summary>
         const int LOGON32_PROVIDER_DEFAULT = 0;
 
-        public DirectoryServicesService(ILog log, 
+        public DirectoryServicesService(ISystemLog log,
             IDirectoryServicesObjectNameNormalizer objectNameNormalizer,
             IDirectoryServicesContextProvider contextProvider)
         {

source/Server/DirectoryServices/GroupRetriever.cs

@@ -12,12 +12,12 @@ namespace Octopus.Server.Extensibility.Authentication.DirectoryServices.Director
 {
     class GroupRetriever : IExternalGroupRetriever
     {
-        readonly ILog log;
+        readonly ISystemLog log;
         readonly IDirectoryServicesConfigurationStore configurationStore;
         readonly IDirectoryServicesExternalSecurityGroupLocator groupLocator;
 
         public GroupRetriever(
-            ILog log,
+            ISystemLog log,
             IDirectoryServicesConfigurationStore configurationStore,
             IDirectoryServicesExternalSecurityGroupLocator groupLocator)
         {