Fixed naming issue (PR feedback)

Cleaned up registeration order, it seems options are logged in order of registeration (by default). Not an expected or necessary behavior.
dotnet · Feb 2, 2018 · 3548522 · 3548522
1 parent d26c6a3
commit 3548522
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/Orleans.Core/Configuration/Options/ClientMessagingOptions.cs b/src/Orleans.Core/Configuration/Options/ClientMessagingOptions.cs
@@ -33,7 +33,7 @@ public ClientMessagingOptionFormatter(IOptions<ClientMessagingOptions> messageOp
 
         public IEnumerable<string> Format()
         {
-            List<string> format = base.FormatStatisticsOptions();
+            List<string> format = base.FormatSharedOptions();
             format.AddRange(new List<string>
             {
                 OptionFormattingUtilities.Format(nameof(options.ClientSenderBuckets), options.ClientSenderBuckets),

diff --git a/src/Orleans.Core/Configuration/Options/ClientStatisticsOptions.cs b/src/Orleans.Core/Configuration/Options/ClientStatisticsOptions.cs
@@ -24,7 +24,7 @@ public ClientStatisticsOptionsFormatter(IOptions<ClientStatisticsOptions> option
 
         public IEnumerable<string> Format()
         {
-            return base.FormatStatisticsOptions();
+            return base.FormatSharedOptions();
         }
     }
 

diff --git a/src/Orleans.Core/Configuration/Options/MessagingOptions.cs b/src/Orleans.Core/Configuration/Options/MessagingOptions.cs
@@ -63,7 +63,7 @@ protected MessagingOptionsFormatter(MessagingOptions options)
             this.options = options;
         }
 
-        protected List<string> FormatStatisticsOptions()
+        protected List<string> FormatSharedOptions()
         {
             return new List<string>()
             {

diff --git a/src/Orleans.Core/Configuration/Options/SiloMessagingOptions.cs b/src/Orleans.Core/Configuration/Options/SiloMessagingOptions.cs
@@ -78,7 +78,7 @@ public SiloMessagingOptionFormatter(IOptions<SiloMessagingOptions> messageOption
 
         public IEnumerable<string> Format()
         {
-            List<string> format = base.FormatStatisticsOptions();
+            List<string> format = base.FormatSharedOptions();
             format.AddRange(new List<string>
             {
                 OptionFormattingUtilities.Format(nameof(options.SiloSenderQueues), options.SiloSenderQueues),

diff --git a/src/Orleans.Core/Configuration/Options/SiloStatisticsOptions.cs b/src/Orleans.Core/Configuration/Options/SiloStatisticsOptions.cs
@@ -50,7 +50,7 @@ public SiloStatisticsOptionsFormatter(IOptions<SiloStatisticsOptions> options)
 
         public IEnumerable<string> Format()
         {
-            List<string> format = base.FormatStatisticsOptions();
+            List<string> format = base.FormatSharedOptions();
             format.AddRange(new List<string>
             {
                 OptionFormattingUtilities.Format(nameof(this.options.DeploymentLoadPublisherRefreshTime), this.options.DeploymentLoadPublisherRefreshTime),

diff --git a/src/Orleans.Core/Configuration/Options/StatisticsOptions.cs b/src/Orleans.Core/Configuration/Options/StatisticsOptions.cs
@@ -55,7 +55,7 @@ protected StatisticsOptionsFormatter(StatisticsOptions options)
             this.options = options;
         }
 
-        protected List<string> FormatStatisticsOptions()
+        protected List<string> FormatSharedOptions()
         {
             return new List<string>()
             {

diff --git a/src/Orleans.Runtime/Hosting/DefaultSiloServices.cs b/src/Orleans.Runtime/Hosting/DefaultSiloServices.cs
@@ -235,17 +235,17 @@ internal static void AddDefaultServices(HostBuilderContext context, IServiceColl
             services.AddTransient<IConfigurationValidator, ApplicationPartValidator>();
 
             //Add default option formatter if none is configured, for options which are requied to be configured 
-            services.TryConfigureFormatter<SiloMessagingOptions, SiloMessagingOptionFormatter>();
-            services.TryConfigureFormatter<SiloStatisticsOptions, SiloStatisticsOptionsFormatter>();
-            services.TryConfigureFormatter<NetworkingOptions, NetworkingOptionFormatter>();
-            services.TryConfigureFormatter<SerializationProviderOptions, SerializationProviderOptionsFormatter>();
             services.TryConfigureFormatter<SiloOptions, SiloOptionsFormatter>();
             services.TryConfigureFormatter<SchedulingOptions, SchedulingOptionsFormatter>();
             services.TryConfigureFormatter<ThreadPoolOptions, ThreadPoolOptionsFormatter>();
-            services.TryConfigureFormatter<GrainPlacementOptions, GrainPlacementOptionsFormatter>();
+            services.TryConfigureFormatter<SerializationProviderOptions, SerializationProviderOptionsFormatter>();
+            services.TryConfigureFormatter<NetworkingOptions, NetworkingOptionFormatter>();
+            services.TryConfigureFormatter<SiloMessagingOptions, SiloMessagingOptionFormatter>();
             services.TryConfigureFormatter<TypeManagementOptions, TypeManagementOptionsFormatter>();
             services.TryConfigureFormatter<GrainDirectoryOptions, GrainDirectoryOptionsFormatter>();
+            services.TryConfigureFormatter<GrainPlacementOptions, GrainPlacementOptionsFormatter>();
             services.TryConfigureFormatter<VersioningOptions, VersioningOptionsFormatter>();
+            services.TryConfigureFormatter<SiloStatisticsOptions, SiloStatisticsOptionsFormatter>();
         }
     }
 }