Skip to content

Commit

Permalink
Rename again
Browse files Browse the repository at this point in the history
  • Loading branch information
Sella-GH committed Jun 10, 2024
1 parent 0e384ed commit e6241c7
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions AzzyBot-Next/Extensions/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public static void AzzyBotServices(this IServiceCollection services)

services.AddSingleton<AzuraCastApiService>();
services.AddSingleton<AzuraCastFileService>();
services.AddSingleton<CoreBackgroundService>();
services.AddHostedService<CoreBackgroundServiceHost>();
services.AddSingleton<IQueuedBackgroundTask>(_ => new AzuraCastBackgroundTask());
services.AddSingleton<AzzyBackgroundService>();
services.AddHostedService<AzzyBackgroundServiceHost>();
services.AddSingleton<IQueuedBackgroundTask>(_ => new QueuedBackgroundTask());

services.AddSingleton<TimerServiceHost>();
services.AddHostedService(s => s.GetRequiredService<TimerServiceHost>());
Expand Down
16 changes: 8 additions & 8 deletions AzzyBot-Next/Logging/LoggerActions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ public static partial class LoggerActions
[LoggerMessage(3, LogLevel.Debug, "Global timer checking for AzuraCast files changes")]
public static partial void GlobalTimerCheckForAzuraCastFiles(this ILogger<TimerServiceHost> logger);

[LoggerMessage(10, LogLevel.Debug, "CoreBackgroundServiceHost started")]
public static partial void CoreBackgroundServiceHostStart(this ILogger<CoreBackgroundServiceHost> logger);
[LoggerMessage(10, LogLevel.Debug, "BackgroundServiceHost started")]
public static partial void BackgroundServiceHostStart(this ILogger<AzzyBackgroundServiceHost> logger);

[LoggerMessage(11, LogLevel.Debug, "CoreBackgroundService started")]
public static partial void CoreBackgroundServiceStart(this ILogger<CoreBackgroundService> logger);
[LoggerMessage(11, LogLevel.Debug, "BackgroundService started")]
public static partial void BackgroundServiceStart(this ILogger<AzzyBackgroundService> logger);

[LoggerMessage(12, LogLevel.Debug, "CoreBackgroundServiceHost running")]
public static partial void CoreBackgroundServiceHostRun(this ILogger<CoreBackgroundServiceHost> logger);
[LoggerMessage(12, LogLevel.Debug, "BackgroundServiceHost running")]
public static partial void BackgroundServiceHostRun(this ILogger<AzzyBackgroundServiceHost> logger);

[LoggerMessage(13, LogLevel.Debug, "Creating work items...")]
public static partial void AzuraCastFileServiceWorkItem(this ILogger<AzuraCastFileService> logger);

[LoggerMessage(90, LogLevel.Debug, "Stopping global timer")]
public static partial void GlobalTimerStop(this ILogger<TimerServiceHost> logger);

[LoggerMessage(91, LogLevel.Debug, "CoreBackgroundServiceHost stopped")]
public static partial void CoreBackgroundServiceHostStop(this ILogger<CoreBackgroundServiceHost> logger);
[LoggerMessage(91, LogLevel.Debug, "BackgroundServiceHost stopped")]
public static partial void BackgroundServiceHostStop(this ILogger<AzzyBackgroundServiceHost> logger);

[LoggerMessage(99, LogLevel.Debug, "Operation {ops} canceled by CancellationToken")]
public static partial void OperationCanceled(this ILogger logger, string ops);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

namespace AzzyBot.Services.Modules;

public sealed class CoreBackgroundService(IHostApplicationLifetime applicationLifetime, ILogger<CoreBackgroundService> logger, AzuraCastFileService azuraCastFileService)
public sealed class AzzyBackgroundService(IHostApplicationLifetime applicationLifetime, ILogger<AzzyBackgroundService> logger, AzuraCastFileService azuraCastFileService)
{
private readonly ILogger<CoreBackgroundService> _logger = logger;
private readonly ILogger<AzzyBackgroundService> _logger = logger;
private readonly AzuraCastFileService _azuraCastFileService = azuraCastFileService;
private readonly CancellationToken _cancellationToken = applicationLifetime.ApplicationStopping;

public async Task StartAzuraCastBackgroundServiceAsync(AzuraCastChecks checks)
{
_logger.CoreBackgroundServiceStart();
_logger.BackgroundServiceStart();

if (_cancellationToken.IsCancellationRequested)
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@

namespace AzzyBot.Services.Modules;

public sealed class CoreBackgroundServiceHost(ILogger<CoreBackgroundServiceHost> logger, IQueuedBackgroundTask taskQueue, DiscordBotService discordBotService) : BackgroundService
public sealed class AzzyBackgroundServiceHost(ILogger<AzzyBackgroundServiceHost> logger, IQueuedBackgroundTask taskQueue, DiscordBotService discordBotService) : BackgroundService
{
private readonly ILogger<CoreBackgroundServiceHost> _logger = logger;
private readonly ILogger<AzzyBackgroundServiceHost> _logger = logger;
private readonly IQueuedBackgroundTask _taskQueue = taskQueue;
private readonly DiscordBotService _botService = discordBotService;

public override async Task StartAsync(CancellationToken cancellationToken)
{
_logger.CoreBackgroundServiceHostStart();
_logger.BackgroundServiceHostStart();

await base.StartAsync(cancellationToken);
}

protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
_logger.CoreBackgroundServiceHostRun();
_logger.BackgroundServiceHostRun();

return ProcessQueueAsync(stoppingToken);
}

public override async Task StopAsync(CancellationToken cancellationToken)
{
_logger.CoreBackgroundServiceHostStop();
_logger.BackgroundServiceHostStop();

await base.StopAsync(cancellationToken);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

namespace AzzyBot.Services.Queues;

public sealed class AzuraCastBackgroundTask : IQueuedBackgroundTask
public sealed class QueuedBackgroundTask : IQueuedBackgroundTask
{
private readonly Channel<Func<CancellationToken, ValueTask>> _queue;

public AzuraCastBackgroundTask()
public QueuedBackgroundTask()
{
BoundedChannelOptions options = new(100)
{
Expand Down
4 changes: 2 additions & 2 deletions AzzyBot-Next/Services/TimerServiceHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

namespace AzzyBot.Services;

public sealed class TimerServiceHost(ILogger<TimerServiceHost> logger, CoreBackgroundService azuraCastBackgroundService, DiscordBotService discordBotService, UpdaterService updaterService) : IAsyncDisposable, IHostedService
public sealed class TimerServiceHost(ILogger<TimerServiceHost> logger, Modules.AzzyBackgroundService azuraCastBackgroundService, DiscordBotService discordBotService, UpdaterService updaterService) : IAsyncDisposable, IHostedService
{
private readonly ILogger<TimerServiceHost> _logger = logger;
private readonly CoreBackgroundService _azuraCastBackgroundService = azuraCastBackgroundService;
private readonly Modules.AzzyBackgroundService _azuraCastBackgroundService = azuraCastBackgroundService;
private readonly DiscordBotService _discordBotService = discordBotService;
private readonly UpdaterService _updaterService = updaterService;
private readonly bool _isDev = AzzyStatsSoftware.GetBotEnvironment == Environments.Development;
Expand Down

0 comments on commit e6241c7

Please sign in to comment.