Skip to content

Commit e7045fb

Browse files
committed
Remove SimpleConsoleLogger dependency from BatchEngine initialization.
1 parent 4546b64 commit e7045fb

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

sandbox/MultiContainedApp/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ class Program
1010
{
1111
static async Task Main(string[] args)
1212
{
13-
await BatchHost.CreateDefaultBuilder().RunBatchEngineAsync(args);
13+
await BatchHost.CreateDefaultBuilder(useSimpleConosoleLogger:true)
14+
.RunBatchEngineAsync(args);
1415
}
1516
}
1617

src/MicroBatchFramework/BatchEngineHostBuilderExtensions.cs

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class BatchEngineHostBuilderExtensions
1515
const string ListCommand = "list";
1616
const string HelpCommand = "help";
1717

18-
public static IHostBuilder UseBatchEngine(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null, bool useSimpleConosoleLogger = true)
18+
public static IHostBuilder UseBatchEngine(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)
1919
{
2020
if (args.Length == 0 || (args.Length == 1 && args[0].Equals(ListCommand, StringComparison.OrdinalIgnoreCase)))
2121
{
@@ -76,20 +76,15 @@ public static IHostBuilder UseBatchEngine(this IHostBuilder hostBuilder, string[
7676
}
7777
});
7878

79-
if (useSimpleConosoleLogger)
80-
{
81-
hostBuilder = hostBuilder.ConfigureLogging(x => x.AddSimpleConsole());
82-
}
83-
8479
return hostBuilder.UseConsoleLifetime();
8580
}
8681

87-
public static Task RunBatchEngineAsync(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null, bool useSimpleConosoleLogger = true)
82+
public static Task RunBatchEngineAsync(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)
8883
{
89-
return UseBatchEngine(hostBuilder, args, interceptor, useSimpleConosoleLogger).Build().RunAsync();
84+
return UseBatchEngine(hostBuilder, args, interceptor).Build().RunAsync();
9085
}
9186

92-
public static IHostBuilder UseBatchEngine<T>(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null, bool useSimpleConosoleLogger = true)
87+
public static IHostBuilder UseBatchEngine<T>(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)
9388
where T : BatchBase
9489
{
9590
var method = typeof(T).GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
@@ -151,18 +146,13 @@ public static IHostBuilder UseBatchEngine<T>(this IHostBuilder hostBuilder, stri
151146
services.AddTransient<T>();
152147
});
153148

154-
if (useSimpleConosoleLogger)
155-
{
156-
hostBuilder = hostBuilder.ConfigureLogging(x => x.AddSimpleConsole());
157-
}
158-
159149
return hostBuilder.UseConsoleLifetime();
160150
}
161151

162-
public static Task RunBatchEngineAsync<T>(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null, bool useSimpleConosoleLogger = true)
152+
public static Task RunBatchEngineAsync<T>(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)
163153
where T : BatchBase
164154
{
165-
return UseBatchEngine<T>(hostBuilder, args, interceptor, useSimpleConosoleLogger).Build().RunAsync();
155+
return UseBatchEngine<T>(hostBuilder, args, interceptor).Build().RunAsync();
166156
}
167157

168158
static void ShowMethodList()

src/MicroBatchFramework/BatchHost.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static class BatchHost
2828
/// and configure the <see cref="SimpleConsoleLogger"/> to log to the console,
2929
/// </remarks>
3030
/// <returns>The initialized <see cref="IHostBuilder"/>.</returns>
31-
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConosoleLogger = true) => CreateDefaultBuilder(useSimpleConosoleLogger, LogLevel.Debug);
31+
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConsoleLogger = true) => CreateDefaultBuilder(useSimpleConsoleLogger, LogLevel.Debug);
3232

3333
/// <summary>
3434
/// Initializes a new instance of the <see cref="HostBuilder"/> class with pre-configured defaults.
@@ -41,10 +41,10 @@ public static class BatchHost
4141
/// load <see cref="IConfiguration"/> from environment variables,
4242
/// and configure the <see cref="SimpleConsoleLogger"/> to log to the console,
4343
/// </remarks>
44-
/// <param name="useSimpleConosoleLogger"></param>
44+
/// <param name="useSimpleConsoleLogger"></param>
4545
/// <param name="minSimpleConsoleLoggerLogLevel"></param>
4646
/// <returns>The initialized <see cref="IHostBuilder"/>.</returns>
47-
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConosoleLogger, LogLevel minSimpleConsoleLoggerLogLevel) => CreateDefaultBuilder(useSimpleConosoleLogger, minSimpleConsoleLoggerLogLevel, "");
47+
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConsoleLogger, LogLevel minSimpleConsoleLoggerLogLevel) => CreateDefaultBuilder(useSimpleConsoleLogger, minSimpleConsoleLoggerLogLevel, "");
4848

4949
/// <summary>
5050
/// Initializes a new instance of the <see cref="HostBuilder"/> class with pre-configured defaults.
@@ -57,17 +57,17 @@ public static class BatchHost
5757
/// load <see cref="IConfiguration"/> from environment variables,
5858
/// and configure the <see cref="SimpleConsoleLogger"/> to log to the console,
5959
/// </remarks>
60-
/// <param name="useSimpleConosoleLogger"></param>
60+
/// <param name="useSimpleConsoleLogger"></param>
6161
/// <param name="minSimpleConsoleLoggerLogLevel"></param>
6262
/// <param name="hostEnvironmentVariable"></param>
6363
/// <returns>The initialized <see cref="IHostBuilder"/>.</returns>
64-
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConosoleLogger, LogLevel minSimpleConsoleLoggerLogLevel, string hostEnvironmentVariable)
64+
public static IHostBuilder CreateDefaultBuilder(bool useSimpleConsoleLogger, LogLevel minSimpleConsoleLoggerLogLevel, string hostEnvironmentVariable)
6565
{
6666
var builder = new HostBuilder();
6767

6868
ConfigureHostConfigurationDefault(builder, hostEnvironmentVariable);
6969
ConfigureAppConfigurationDefault(builder);
70-
ConfigureLoggingDefault(builder, useSimpleConosoleLogger, minSimpleConsoleLoggerLogLevel);
70+
ConfigureLoggingDefault(builder, useSimpleConsoleLogger, minSimpleConsoleLoggerLogLevel);
7171

7272
return builder;
7373
}
@@ -111,9 +111,9 @@ internal static void ConfigureAppConfigurationDefault(IHostBuilder builder)
111111
});
112112
}
113113

114-
internal static void ConfigureLoggingDefault(IHostBuilder builder, bool useSimpleConosoleLogger, LogLevel minSimpleConsoleLoggerLogLevel)
114+
internal static void ConfigureLoggingDefault(IHostBuilder builder, bool useSimpleConsoleLogger, LogLevel minSimpleConsoleLoggerLogLevel)
115115
{
116-
if (useSimpleConosoleLogger)
116+
if (useSimpleConsoleLogger)
117117
{
118118
builder.ConfigureLogging(logging =>
119119
{

0 commit comments

Comments
 (0)