Skip to content

Commit 95ec3cf

Browse files
committed
spaces to tabs fixes from robertx PR #1831
1 parent dbee0a2 commit 95ec3cf

File tree

3 files changed

+300
-296
lines changed

3 files changed

+300
-296
lines changed

src/Elasticsearch.Net/ConnectionPool/StickyConnectionPool.cs

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -5,98 +5,98 @@
55

66
namespace Elasticsearch.Net
77
{
8-
public class StickyConnectionPool : IConnectionPool
9-
{
10-
protected IDateTimeProvider DateTimeProvider { get; }
8+
public class StickyConnectionPool : IConnectionPool
9+
{
10+
protected IDateTimeProvider DateTimeProvider { get; }
1111

12-
protected List<Node> InternalNodes { get; set; }
12+
protected List<Node> InternalNodes { get; set; }
1313

14-
public bool UsingSsl { get; }
15-
public bool SniffedOnStartup { get; set; }
14+
public bool UsingSsl { get; }
15+
public bool SniffedOnStartup { get; set; }
1616

17-
public IReadOnlyCollection<Node> Nodes => this.InternalNodes;
17+
public IReadOnlyCollection<Node> Nodes => this.InternalNodes;
1818

19-
public int MaxRetries => this.InternalNodes.Count - 1;
19+
public int MaxRetries => this.InternalNodes.Count - 1;
2020

21-
public bool SupportsReseeding => false;
21+
public bool SupportsReseeding => false;
2222

23-
public bool SupportsPinging => true;
23+
public bool SupportsPinging => true;
2424

25-
public DateTime LastUpdate { get; protected set; }
25+
public DateTime LastUpdate { get; protected set; }
2626

27-
public StickyConnectionPool(IEnumerable<Uri> uris, IDateTimeProvider dateTimeProvider = null)
28-
: this(uris.Select(uri => new Node(uri)), dateTimeProvider)
29-
{ }
27+
public StickyConnectionPool(IEnumerable<Uri> uris, IDateTimeProvider dateTimeProvider = null)
28+
: this(uris.Select(uri => new Node(uri)), dateTimeProvider)
29+
{ }
3030

31-
public StickyConnectionPool(IEnumerable<Node> nodes, IDateTimeProvider dateTimeProvider = null)
32-
{
33-
nodes.ThrowIfEmpty(nameof(nodes));
31+
public StickyConnectionPool(IEnumerable<Node> nodes, IDateTimeProvider dateTimeProvider = null)
32+
{
33+
nodes.ThrowIfEmpty(nameof(nodes));
3434

35-
this.DateTimeProvider = dateTimeProvider ?? Elasticsearch.Net.DateTimeProvider.Default;
35+
this.DateTimeProvider = dateTimeProvider ?? Elasticsearch.Net.DateTimeProvider.Default;
3636

37-
var nn = nodes.ToList();
38-
var uris = nn.Select(n => n.Uri).ToList();
39-
if (uris.Select(u => u.Scheme).Distinct().Count() > 1)
40-
throw new ArgumentException("Trying to instantiate a connection pool with mixed URI Schemes");
37+
var nn = nodes.ToList();
38+
var uris = nn.Select(n => n.Uri).ToList();
39+
if (uris.Select(u => u.Scheme).Distinct().Count() > 1)
40+
throw new ArgumentException("Trying to instantiate a connection pool with mixed URI Schemes");
4141

42-
this.UsingSsl = uris.Any(uri => uri.Scheme == "https");
42+
this.UsingSsl = uris.Any(uri => uri.Scheme == "https");
4343

44-
this.InternalNodes = nn
45-
.DistinctBy(n => n.Uri)
46-
.ToList();
44+
this.InternalNodes = nn
45+
.DistinctBy(n => n.Uri)
46+
.ToList();
4747

48-
this.LastUpdate = this.DateTimeProvider.Now();
49-
}
48+
this.LastUpdate = this.DateTimeProvider.Now();
49+
}
5050

51-
protected int GlobalCursor = -1;
51+
protected int GlobalCursor = -1;
5252

53-
public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
54-
{
55-
var now = this.DateTimeProvider.Now();
56-
var nodes = this.InternalNodes.Where(n => n.IsAlive || n.DeadUntil <= now)
57-
.ToList();
58-
var count = nodes.Count;
59-
Node node;
53+
public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null)
54+
{
55+
var now = this.DateTimeProvider.Now();
56+
var nodes = this.InternalNodes.Where(n => n.IsAlive || n.DeadUntil <= now)
57+
.ToList();
58+
var count = nodes.Count;
59+
Node node;
6060

61-
if (count == 0)
62-
{
63-
var globalCursor = Interlocked.Increment(ref GlobalCursor);
64-
//could not find a suitable node retrying on first node off globalCursor
65-
audit?.Invoke(AuditEvent.AllNodesDead, null);
66-
node = this.InternalNodes[globalCursor % this.InternalNodes.Count];
67-
node.IsResurrected = true;
68-
audit?.Invoke(AuditEvent.Resurrection, node);
69-
yield return node;
70-
yield break;
71-
}
61+
if (count == 0)
62+
{
63+
var globalCursor = Interlocked.Increment(ref GlobalCursor);
64+
//could not find a suitable node retrying on first node off globalCursor
65+
audit?.Invoke(AuditEvent.AllNodesDead, null);
66+
node = this.InternalNodes[globalCursor % this.InternalNodes.Count];
67+
node.IsResurrected = true;
68+
audit?.Invoke(AuditEvent.Resurrection, node);
69+
yield return node;
70+
yield break;
71+
}
7272

73-
// If the cursor is greater than the default then it's been
74-
// set already but we now have a live node so we should reset it
75-
if (GlobalCursor > -1)
76-
{
77-
Interlocked.Exchange(ref GlobalCursor, -1);
78-
}
73+
// If the cursor is greater than the default then it's been
74+
// set already but we now have a live node so we should reset it
75+
if (GlobalCursor > -1)
76+
{
77+
Interlocked.Exchange(ref GlobalCursor, -1);
78+
}
7979

80-
var localCursor = 0;
80+
var localCursor = 0;
8181

82-
for (var attempts = 0; attempts < count; attempts++)
83-
{
84-
node = nodes[localCursor];
85-
localCursor = (localCursor + 1) % count;
86-
//if this node is not alive or no longer dead mark it as resurrected
87-
if (!node.IsAlive)
88-
{
89-
audit?.Invoke(AuditEvent.Resurrection, node);
90-
node.IsResurrected = true;
91-
}
92-
yield return node;
93-
}
94-
}
82+
for (var attempts = 0; attempts < count; attempts++)
83+
{
84+
node = nodes[localCursor];
85+
localCursor = (localCursor + 1) % count;
86+
//if this node is not alive or no longer dead mark it as resurrected
87+
if (!node.IsAlive)
88+
{
89+
audit?.Invoke(AuditEvent.Resurrection, node);
90+
node.IsResurrected = true;
91+
}
92+
yield return node;
93+
}
94+
}
9595

96-
public void Reseed(IEnumerable<Node> nodes) { }
96+
public void Reseed(IEnumerable<Node> nodes) { }
9797

98-
void IDisposable.Dispose() => this.DisposeManagedResources();
98+
void IDisposable.Dispose() => this.DisposeManagedResources();
9999

100-
protected virtual void DisposeManagedResources() { }
101-
}
100+
protected virtual void DisposeManagedResources() { }
101+
}
102102
}

0 commit comments

Comments
 (0)