From 19c0ddde59b956b67205aaae7dc9ae6eed9d923a Mon Sep 17 00:00:00 2001 From: slewis74 Date: Tue, 9 Mar 2021 09:23:05 +1000 Subject: [PATCH 1/2] new logging infra --- source/Server/Configuration/DatabaseInitializer.cs | 4 ++-- source/Server/Configuration/GuestConfigureCommands.cs | 6 +++--- source/Server/GuestAuth/GuestCredentialValidator.cs | 4 ++-- source/Server/GuestAuth/GuestUserStateChecker.cs | 4 ++-- source/Server/Server.csproj | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/Server/Configuration/DatabaseInitializer.cs b/source/Server/Configuration/DatabaseInitializer.cs index 1f70041..7187306 100644 --- a/source/Server/Configuration/DatabaseInitializer.cs +++ b/source/Server/Configuration/DatabaseInitializer.cs @@ -8,14 +8,14 @@ namespace Octopus.Server.Extensibility.Authentication.Guest.Configuration { class DatabaseInitializer : ExecuteWhenDatabaseInitializes { - readonly ILog log; + readonly ISystemLog log; readonly IWritableKeyValueStore settings; readonly IConfigurationStore configurationStore; readonly IGuestUserStateChecker guestUserStateChecker; private bool cleanupRequired = false; - public DatabaseInitializer(ILog log, IWritableKeyValueStore settings, IConfigurationStore configurationStore, IGuestUserStateChecker guestUserStateChecker) + public DatabaseInitializer(ISystemLog log, IWritableKeyValueStore settings, IConfigurationStore configurationStore, IGuestUserStateChecker guestUserStateChecker) { this.log = log; this.settings = settings; diff --git a/source/Server/Configuration/GuestConfigureCommands.cs b/source/Server/Configuration/GuestConfigureCommands.cs index 82524f1..592ce15 100644 --- a/source/Server/Configuration/GuestConfigureCommands.cs +++ b/source/Server/Configuration/GuestConfigureCommands.cs @@ -7,11 +7,11 @@ namespace Octopus.Server.Extensibility.Authentication.Guest.Configuration { class GuestConfigureCommands : IContributeToConfigureCommand { - readonly ILog log; + readonly ISystemLog log; readonly Lazy configurationStore; public GuestConfigureCommands( - ILog log, + ISystemLog log, Lazy configurationStore) { this.log = log; @@ -25,7 +25,7 @@ public IEnumerable GetOptions() var isEnabled = bool.Parse(v); configurationStore.Value.SetIsEnabled(isEnabled); log.Info($"Guest login enabled: {isEnabled}"); - }); + }); } } } \ No newline at end of file diff --git a/source/Server/GuestAuth/GuestCredentialValidator.cs b/source/Server/GuestAuth/GuestCredentialValidator.cs index 545ed5c..da73aac 100644 --- a/source/Server/GuestAuth/GuestCredentialValidator.cs +++ b/source/Server/GuestAuth/GuestCredentialValidator.cs @@ -10,12 +10,12 @@ namespace Octopus.Server.Extensibility.Authentication.Guest.GuestAuth { class GuestCredentialValidator : IGuestCredentialValidator { - readonly ILog log; + readonly ISystemLog log; readonly IUserStore userStore; readonly IGuestConfigurationStore configurationStore; public GuestCredentialValidator( - ILog log, + ISystemLog log, IUserStore userStore, IGuestConfigurationStore configurationStore) { diff --git a/source/Server/GuestAuth/GuestUserStateChecker.cs b/source/Server/GuestAuth/GuestUserStateChecker.cs index c3f85c8..0ee253f 100644 --- a/source/Server/GuestAuth/GuestUserStateChecker.cs +++ b/source/Server/GuestAuth/GuestUserStateChecker.cs @@ -10,10 +10,10 @@ namespace Octopus.Server.Extensibility.Authentication.Guest.GuestAuth { class GuestUserStateChecker : IGuestUserStateChecker { - readonly ILog log; + readonly ISystemLog log; readonly IUpdateableUserStore userStore; - public GuestUserStateChecker(ILog log, IUpdateableUserStore userStore) + public GuestUserStateChecker(ISystemLog log, IUpdateableUserStore userStore) { this.log = log; this.userStore = userStore; diff --git a/source/Server/Server.csproj b/source/Server/Server.csproj index f611fdd..66fac8d 100644 --- a/source/Server/Server.csproj +++ b/source/Server/Server.csproj @@ -15,8 +15,8 @@ - - + + From 4b0f41432bf26460feed5adf18f68dcb86f534de Mon Sep 17 00:00:00 2001 From: slewis74 Date: Thu, 18 Mar 2021 09:34:31 +1000 Subject: [PATCH 2/2] package updates --- source/Server/Server.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Server/Server.csproj b/source/Server/Server.csproj index 66fac8d..509a1ba 100644 --- a/source/Server/Server.csproj +++ b/source/Server/Server.csproj @@ -15,8 +15,8 @@ - - + +