diff --git a/rss-generator/Class/Common/LogManager.cs b/rss-generator/Class/Common/LogManager.cs index 4ff6e22..e018da5 100644 --- a/rss-generator/Class/Common/LogManager.cs +++ b/rss-generator/Class/Common/LogManager.cs @@ -37,10 +37,12 @@ internal static class LogManager // 実際のクラス名に合わせてくだ /// public static void AddLog(string? message) { + string text = message?.TrimEnd('\r', '\n') ?? string.Empty; + Console.WriteLine($"[{DateTime.Now:HH:mm:ss}] {text}"); var log = new LogMessage { - Message = message!.TrimEnd('\r', '\n'), + Message = text, Timestamp = DateTime.Now // ログが発生した瞬間の時間を保持 }; diff --git a/rss-generator/Program.cs b/rss-generator/Program.cs index 37068d8..b3edcf0 100644 --- a/rss-generator/Program.cs +++ b/rss-generator/Program.cs @@ -50,11 +50,19 @@ var serviceProvider = services.BuildServiceProvider(); // ファクトリインスタンスを取り出す var httpClientFactory = serviceProvider.GetRequiredService(); +// 定期実行とファイル変更監視トリガーとの排他制御用セマフォ +var executionLock = new SemaphoreSlim(1, 1); + +// 外部設定ファイル(C:\feeds\src\*.json)の変更監視を開始 +using var configWatcher = new ExternalConfigWatcher(httpClientFactory, executionLock); +configWatcher.RegisterHandler(YouTubeConfig.ConfigFileName, "YouTube", client => YouTubeFeedManager.CreateRSSAsync(client)); +configWatcher.Start(); + LogManager.AddLog($"[情報] rss-generatorの起動"); var isFirst = true; -// 生成完了後の待機時間(固定で30分) -TimeSpan waitInterval = TimeSpan.FromMinutes(30); +// 生成完了後の待機時間(固定で5分) +TimeSpan waitInterval = TimeSpan.FromMinutes(5); while (true) { @@ -67,13 +75,15 @@ while (true) #if DEBUG #else var nextRunTime = DateTime.Now.Add(waitInterval); - LogManager.AddLog($"[情報] 次回実行予定: {nextRunTime:HH:mm:ss} (固定で30分待機)"); + LogManager.AddLog($"[情報] 次回実行予定: {nextRunTime:HH:mm:ss} (固定で5分待機)"); - // 生成完了後、固定で30分待機(非同期スリープ) + // 生成完了後、固定で5分待機(非同期スリープ) await Task.Delay(waitInterval); #endif } + // 定期実行の排他ロックを取得 + await executionLock.WaitAsync(); // 指定時刻になったら処理を実行 Stopwatch totalSw = Stopwatch.StartNew(); Stopwatch sw = Stopwatch.StartNew(); @@ -91,7 +101,7 @@ while (true) var feedActions = new List<(string Name, Func Action)>(); #if DEBUG - feedActions.Add(("movie.eroterest.net", () => MovieEroterestFeedManager.CreateAllRSSAsync(client))); + feedActions.Add(("YouTube", () => YouTubeFeedManager.CreateRSSAsync(client))); #else feedActions.Add(("movie.eroterest.net", () => MovieEroterestFeedManager.CreateAllRSSAsync(client))); feedActions.Add(("YouTube", () => YouTubeFeedManager.CreateRSSAsync(client))); @@ -161,4 +171,8 @@ while (true) LogManager.AddLog($"{ex.StackTrace}"); //await LogManager.FlushAndCloseAsync(); } + finally + { + executionLock.Release(); + } } \ No newline at end of file