Skip to content

Commit 41139ac

Browse files
author
Alex McCool
committed
touch
1 parent b81b87a commit 41139ac

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

example/SampleApp/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public Program()
3939
.AddEventSourceLogger()
4040
.AddElasticSearch(options =>
4141
{
42-
//options.ElasticsearchEndpoint = new Uri(@"http://localhost:9200/");
43-
options.ElasticsearchEndpoint = new Uri(@"http://es.devint.dev-r5ead.net:9200/");
42+
options.ElasticsearchEndpoint = new Uri(@"http://localhost:9200/");
4443
});
4544
});
4645

src/ElasticLogger.Test/APMTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ public APMTests(ElasticsearchFixture fixture, ITestOutputHelper outputHelper)
2020
[Fact]
2121
public async Task LoggingThing()
2222
{
23-
var factory = new CustomWebApplicationFactory<Startup>();
23+
await _fixture.ReadyAsync();
24+
25+
var factory = new CustomWebApplicationFactory<Startup>(_fixture);
2426

2527
var client = factory.CreateClient();
2628

src/ElasticLogger.Test/ElasticsearchLoggerFilterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ElasticsearchLoggerFilterTests(ElasticsearchFixture fixture, ITestOutputH
2828

2929
private ConnectionSettings connectionSettings(Uri endpoint)
3030
{
31-
var connSettings = new ConnectionSettings(_fixture.Endpoint);
31+
var connSettings = new ConnectionSettings(endpoint);
3232
connSettings.ServerCertificateValidationCallback((obj, cert, chain, policyerrors) => true);
3333
return connSettings;
3434
}

src/ElasticLogger.Test/Factory/CustomWebApplicationFactory.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Text;
5-
using AM.Extensions.Logging.ElasticSearch;
1+
using AM.Extensions.Logging.ElasticSearch;
62
using ElasticLogger.Test.Fixture;
73
using Microsoft.AspNetCore;
84
using Microsoft.AspNetCore.Hosting;
95
using Microsoft.AspNetCore.Mvc.Testing;
106
using Microsoft.Extensions.Configuration;
11-
using Microsoft.Extensions.DependencyInjection;
12-
using Microsoft.Extensions.Logging;
7+
using System;
8+
using System.IO;
139

1410
namespace ElasticLogger.Test.Factory
1511
{
1612
public class CustomWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup> where TStartup : class
1713
{
14+
private ElasticsearchFixture _fixture;
15+
16+
public CustomWebApplicationFactory(ElasticsearchFixture fixture) : base()
17+
{
18+
_fixture = fixture;
19+
}
20+
21+
1822
protected override IWebHostBuilder CreateWebHostBuilder()
1923
{
2024
return WebHost.CreateDefaultBuilder()
@@ -33,7 +37,8 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
3337

3438
builder.ConfigureLogging((hostingContext, logging) =>
3539
{
36-
Uri uri = new Uri(@"http://es.fakething.net:9200");
40+
//Uri uri = new Uri(@"http://es.fakething.net:9200");
41+
Uri uri = _fixture.Endpoint;
3742

3843
logging.AddElasticSearch(options => { options.ElasticsearchEndpoint = uri; });
3944
});

0 commit comments

Comments
 (0)