Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Configuration;
using System.Data.Common;
using System.IO;
using System.Linq;
using Instances;
using NuGet.Versioning;

Expand All @@ -21,14 +22,20 @@ protected override void UpdateSettings()

var settings = Config.AppSettings.Settings;
var version = details.Version;
//ServiceControl.Audit.Persistence.RavenDB.RavenPersistenceConfiguration.ConnectionStringKey
var hasOnlyRemoteRavenDbConnection = settings.AllKeys.Contains("RavenDB/ConnectionString")
&& !settings.AllKeys.Contains(AuditInstanceSettingsList.DBPath.Name);

settings.Set(ServiceControlSettings.InstanceName, details.InstanceName, version);
settings.Set(ServiceControlSettings.VirtualDirectory, details.VirtualDirectory);
settings.Set(ServiceControlSettings.Port, details.Port.ToString());
settings.Set(ServiceControlSettings.DatabaseMaintenancePort, details.DatabaseMaintenancePort.ToString(), version);
settings.Set(ServiceControlSettings.HostName, details.HostName);
settings.Set(ServiceControlSettings.LogPath, details.LogPath);
settings.Set(ServiceControlSettings.DBPath, details.DBPath);
if (hasOnlyRemoteRavenDbConnection)
{
settings.Set(ServiceControlSettings.DBPath, details.DBPath);
}
settings.Set(ServiceControlSettings.ForwardErrorMessages, details.ForwardErrorMessages.ToString(), version);
settings.Set(ServiceControlSettings.TransportType, details.TransportPackage.Name, version);
settings.Set(ServiceControlSettings.PersistenceType, details.PersistenceManifest.Name); // TODO: Why is it set here AND at ServiceControlInstance.ApplySettingsChanges 🤬
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,18 @@ protected override void UpdateSettings()
// Windows via SCMU or PowerShell
settings.Set(AuditInstanceSettingsList.ShutdownTimeout, "00:02:00", version);

//ServiceControl.Audit.Persistence.RavenDB.RavenPersistenceConfiguration.ConnectionStringKey
var hasOnlyRemoteRavenDbConnection = settings.AllKeys.Contains("RavenDB/ConnectionString")
&& !settings.AllKeys.Contains(AuditInstanceSettingsList.DBPath.Name);

foreach (var manifestSetting in instance.PersistenceManifest.Settings)
{
if (manifestSetting.Name == AuditInstanceSettingsList.DBPath.Name
&& hasOnlyRemoteRavenDbConnection)
{
continue;
}

if (!settings.AllKeys.Contains(manifestSetting.Name))
{
var value = manifestSetting.DefaultValue;
Expand Down
Loading