tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 09:15:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

hacking around

Browse Source
This commit is contained in:
Tom Gardham-Pallister
2018-05-08 22:57:59 +01:00
parent 66bc6203ad
commit 22fc8668af
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ocelot/Raft/HttpPeer.cs
View File

@@ -88,6 +88,7 @@ namespace Ocelot.Raft
public Response<T> Request<T>(T command) public Response<T> Request<T>(T command)
where T : ICommand where T : ICommand
{ {
Console.WriteLine("SENDING REQUEST....");
if(_token == null) if(_token == null)
{ {
SetToken(); SetToken();
@@ -99,11 +100,13 @@ namespace Ocelot.Raft
var response = _httpClient.PostAsync($"{_hostAndPort}/administration/raft/command", content).GetAwaiter().GetResult(); var response = _httpClient.PostAsync($"{_hostAndPort}/administration/raft/command", content).GetAwaiter().GetResult();
if(response.IsSuccessStatusCode) if(response.IsSuccessStatusCode)
{ {
Console.WriteLine("REQUEST OK....");
var okResponse = JsonConvert.DeserializeObject<OkResponse<ICommand>>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), _jsonSerializerSettings); var okResponse = JsonConvert.DeserializeObject<OkResponse<ICommand>>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), _jsonSerializerSettings);
return new OkResponse<T>((T)okResponse.Command); return new OkResponse<T>((T)okResponse.Command);
} }
else else
{ {
Console.WriteLine("REQUEST NOT OK....");
return new ErrorResponse<T>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), command); return new ErrorResponse<T>(response.Content.ReadAsStringAsync().GetAwaiter().GetResult(), command);
} }
} }

5
test/Ocelot.IntegrationTests/RaftTests.cs
View File

@@ -105,6 +105,7 @@ namespace Ocelot.IntegrationTests
GivenFiveServersAreRunning(); GivenFiveServersAreRunning();
GivenIHaveAnOcelotToken("/administration"); GivenIHaveAnOcelotToken("/administration");
WhenISendACommandIntoTheCluster(command); WhenISendACommandIntoTheCluster(command);
Thread.Sleep(5000);
ThenTheCommandIsReplicatedToAllStateMachines(command); ThenTheCommandIsReplicatedToAllStateMachines(command);
} }
@@ -261,8 +262,8 @@ namespace Ocelot.IntegrationTests
} }
catch(Exception e) catch(Exception e)
{ {
_output.WriteLine($"{e.Message}, {e.StackTrace}"); //_output.WriteLine($"{e.Message}, {e.StackTrace}");
Console.WriteLine(e); //Console.WriteLine(e);
return false; return false;
} }
} }