Skip to content

Commit 1452cec

Browse files
committed
.net Demon seems a bit flakey invalidating projects and rebuilding, broke the build
1 parent 4631141 commit 1452cec

File tree

4 files changed

+11
-30
lines changed

4 files changed

+11
-30
lines changed

src/HackerNews.Indexer/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ static void Main(string[] args)
2727
.SetDefaultIndex("mpdreamz")
2828
.SetMaximumAsyncConnections(50);
2929
var client = new ElasticClient(elasticSettings);
30-
ConnectionStatus connectionStatus;
31-
if (!client.TryConnect(out connectionStatus))
30+
var result >
31+
if (!client.(out connectionStatus))
3232
{
3333
Console.Error.WriteLine("Could not connect to {0}:\r\n{1}",
3434
elasticSettings.Host, connectionStatus.Error.OriginalException.Message);

src/Nest.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest\Nest.csproj",
44
EndProject
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Tests.Integration", "Nest.Tests.Integration\Nest.Tests.Integration.csproj", "{9E38CD2C-EEFD-4C82-B0CD-D0608C27D64F}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HackerNews.Indexer", "HackerNews.Indexer\HackerNews.Indexer.csproj", "{E39CC264-A7B3-490D-84B2-D3016D86CD87}"
8-
EndProject
97
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Notes", "_Notes", "{E30CA256-C9A8-487A-94B7-D6B79D70F774}"
108
ProjectSection(SolutionItems) = preProject
119
license.txt = license.txt
@@ -70,18 +68,6 @@ Global
7068
{9E38CD2C-EEFD-4C82-B0CD-D0608C27D64F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
7169
{9E38CD2C-EEFD-4C82-B0CD-D0608C27D64F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
7270
{9E38CD2C-EEFD-4C82-B0CD-D0608C27D64F}.Release|x86.ActiveCfg = Release|Any CPU
73-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
76-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|Mixed Platforms.Build.0 = Debug|x86
77-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|x86.ActiveCfg = Debug|x86
78-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Debug|x86.Build.0 = Debug|x86
79-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|Any CPU.Build.0 = Release|Any CPU
81-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|Mixed Platforms.ActiveCfg = Release|x86
82-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|Mixed Platforms.Build.0 = Release|x86
83-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|x86.ActiveCfg = Release|x86
84-
{E39CC264-A7B3-490D-84B2-D3016D86CD87}.Release|x86.Build.0 = Release|x86
8571
{27143A05-5655-447C-ADAF-405E1CF43741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8672
{27143A05-5655-447C-ADAF-405E1CF43741}.Debug|Any CPU.Build.0 = Debug|Any CPU
8773
{27143A05-5655-447C-ADAF-405E1CF43741}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -147,7 +133,6 @@ Global
147133
HideSolutionNode = FALSE
148134
EndGlobalSection
149135
GlobalSection(NestedProjects) = preSolution
150-
{E39CC264-A7B3-490D-84B2-D3016D86CD87} = {DDC38E1C-13BF-4C96-A3BF-60F14DFC5069}
151136
{B9FE4875-0171-40F7-A357-064A93BE09C6} = {DDC38E1C-13BF-4C96-A3BF-60F14DFC5069}
152137
{2727A374-9866-4A9D-9A40-6175334B5992} = {DDC38E1C-13BF-4C96-A3BF-60F14DFC5069}
153138
EndGlobalSection

src/ProtocolLoadTest/Program.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,11 @@ private static void RecreateIndex(string suffix)
8282

8383
var client = new ElasticClient(connSettings);
8484

85-
ConnectionStatus connStatus;
86-
87-
if (!client.TryConnect(out connStatus))
85+
var result = client.GetRootNodeInfo();
86+
if (!result.IsValid)
8887
{
8988
Console.Error.WriteLine("Could not connect to {0}:\r\n{1}",
90-
connSettings.Host, connStatus.Error.OriginalException.Message);
89+
connSettings.Host, result.ConnectionStatus.Error.OriginalException.Message);
9190
Console.Read();
9291
return;
9392
}
@@ -116,12 +115,11 @@ private static void CloseIndex(string suffix)
116115

117116
var client = new ElasticClient(connSettings);
118117

119-
ConnectionStatus connStatus;
120-
121-
if (!client.TryConnect(out connStatus))
118+
var result = client.GetRootNodeInfo();
119+
if (!result.IsValid)
122120
{
123121
Console.Error.WriteLine("Could not connect to {0}:\r\n{1}",
124-
connSettings.Host, connStatus.Error.OriginalException.Message);
122+
connSettings.Host, result.ConnectionStatus.Error.OriginalException.Message);
125123
Console.Read();
126124
return;
127125
}

src/ProtocolLoadTest/Tester.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ protected ConnectionSettings CreateSettings(string indexName, int port)
2626

2727
protected void Connect(ElasticClient client, ConnectionSettings settings)
2828
{
29-
ConnectionStatus indexConnectionStatus;
30-
31-
if (!client.TryConnect(out indexConnectionStatus))
29+
var result = client.GetRootNodeInfo();
30+
if (!result.IsValid)
3231
{
3332
Console.Error.WriteLine("Could not connect to {0}:\r\n{1}",
34-
settings.Host, indexConnectionStatus.Error.OriginalException.Message);
33+
settings.Host, result.ConnectionStatus.Error.OriginalException.Message);
3534
Console.Read();
36-
return;
3735
}
3836
}
3937

0 commit comments

Comments
 (0)