Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced life cycle stage enums with constants #3887

Merged
merged 1 commit into from
Jan 19, 2018
Merged
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
8 changes: 4 additions & 4 deletions src/Orleans.Core.Abstractions/Runtime/GrainLifecycleStage.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Orleans.Runtime
namespace Orleans.Runtime
{
/// <summary>
/// Stages of a grains lifecycle.
Expand All @@ -7,16 +7,16 @@
/// stream cleanup should all eventually be triggered by the
/// grain lifecycle.
/// </summary>
public enum GrainLifecycleStage
public static class GrainLifecycleStage
{
/// <summary>
/// Setup grain state prior to activation
/// </summary>
SetupState = 1000,
public const int SetupState = 1000;

/// <summary>
/// Activate grain
/// </summary>
Activate = 2000
public const int Activate = 2000;
}
}
25 changes: 0 additions & 25 deletions src/Orleans.Core.Abstractions/Runtime/IGrainLifeCycle.cs

This file was deleted.

6 changes: 3 additions & 3 deletions src/Orleans.Core/LogConsistency/LogConsistentGrain.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -57,8 +57,8 @@ public override void Participate(IGrainLifecycle lifecycle)
lifecycle.Subscribe(GrainLifecycleStage.SetupState, OnSetupState);
if(this is ILogConsistencyProtocolParticipant)
{
lifecycle.Subscribe((int)GrainLifecycleStage.Activate - 1, PreActivate);
lifecycle.Subscribe((int)GrainLifecycleStage.Activate + 1, PostActivate);
lifecycle.Subscribe(GrainLifecycleStage.Activate - 1, PreActivate);
lifecycle.Subscribe(GrainLifecycleStage.Activate + 1, PostActivate);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
Expand All @@ -15,8 +15,8 @@ namespace Orleans.Hosting
{
internal static class LegacyClusterConfigurationExtensions
{
private const int SiloDefaultProviderInitStage = (int)SiloLifecycleStage.RuntimeStorageServices;
private const int SiloDefaultProviderStartStage = (int)SiloLifecycleStage.ApplicationServices;
private const int SiloDefaultProviderInitStage = SiloLifecycleStage.RuntimeStorageServices;
private const int SiloDefaultProviderStartStage = SiloLifecycleStage.ApplicationServices;

public static IServiceCollection AddLegacyClusterConfigurationSupport(this IServiceCollection services, ClusterConfiguration configuration)
{
Expand Down
24 changes: 0 additions & 24 deletions src/Orleans.Runtime/Lifecycle/SiloLifecycleExtensions.cs

This file was deleted.

16 changes: 8 additions & 8 deletions src/Orleans.Runtime/Lifecycle/SiloLifecycleStage.cs
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@


namespace Orleans.Runtime
{
/// <summary>
/// Stages of a silo's lifecycle.
/// </summary>
public enum SiloLifecycleStage
public static class SiloLifecycleStage
{
/// <summary>
/// Initialize silo runtime
/// </summary>
RuntimeInitialize = 1000,
public const int RuntimeInitialize = 1000;

/// <summary>
/// Start runtime services
/// </summary>
RuntimeServices = 2000,
public const int RuntimeServices = 2000;

/// <summary>
/// Initialize runtime storage
/// </summary>
RuntimeStorageServices = 3000,
public const int RuntimeStorageServices = 3000;

/// <summary>
/// Start runtime services
/// </summary>
RuntimeGrainServices = 4000,
public const int RuntimeGrainServices = 4000;

/// <summary>
/// Start application layer services
/// </summary>
ApplicationServices = 5000,
public const int ApplicationServices = 5000;

/// <summary>
/// Silo is active and available to service requests
/// </summary>
SiloActive = 6000,
public const int SiloActive = 6000;
}
}