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.

Sign up for GitHub

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

Jump to bottom

fix missing check for empty deployment id #2786

Merged
merged 2 commits into from
Mar 1, 2017
Merged

fix missing check for empty deployment id #2786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f13b2e
fix missing check for empty deployment id
sebastianburckhardt Feb 27, 2017
7019eb2
change default cluster id to more meaningful name: DefaultClusterId
sebastianburckhardt Feb 28, 2017
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
7 changes: 6 additions & 1 deletion src/OrleansRuntime/Silo/Silo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,14 @@ public bool HasMultiClusterNetwork
/// <summary> Get the id of the cluster this silo is part of. </summary>
public string ClusterId
{
get { return GlobalConfig.HasMultiClusterNetwork ? GlobalConfig.ClusterId : GlobalConfig.DeploymentId; }
get {
var configuredId = GlobalConfig.HasMultiClusterNetwork ? GlobalConfig.ClusterId : GlobalConfig.DeploymentId;
return string.IsNullOrEmpty(configuredId) ? CLUSTER_ID_DEFAULT : configuredId;
}
}

private const string CLUSTER_ID_DEFAULT = "DefaultClusterID"; // if no id is configured, we pick a nonempty default.

/// <summary> SiloAddress for this silo. </summary>
public SiloAddress SiloAddress => this.initializationParams.SiloAddress;

Expand Down