forked from sim0n00ps/OF-DL
Compare commits
2 Commits
f421bf128f
...
0f479a0268
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f479a0268 | |||
| bbda791316 |
@ -31,6 +31,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.1" />
|
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.1" />
|
||||||
|
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
|
||||||
<PackageReference Include="Akka" Version="1.5.60"/>
|
<PackageReference Include="Akka" Version="1.5.60"/>
|
||||||
<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1"/>
|
<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1"/>
|
||||||
<PackageReference Include="HtmlAgilityPack" Version="1.12.4"/>
|
<PackageReference Include="HtmlAgilityPack" Version="1.12.4"/>
|
||||||
|
|||||||
@ -20,7 +20,7 @@ static async Task<ServiceCollection> ConfigureServices(string[] args)
|
|||||||
{
|
{
|
||||||
// Set up dependency injection with LoggingService and ConfigService
|
// Set up dependency injection with LoggingService and ConfigService
|
||||||
ServiceCollection services = new();
|
ServiceCollection services = new();
|
||||||
services.AddSingleton<ILoggingService, SeqLoggingService>();
|
services.AddSingleton<ILoggingService, CajetanLoggingService>();
|
||||||
services.AddSingleton<IConfigService, ConfigService>();
|
services.AddSingleton<IConfigService, ConfigService>();
|
||||||
services.AddSingleton(new ExitHelper(new SpectreDownloadEventHandler()));
|
services.AddSingleton(new ExitHelper(new SpectreDownloadEventHandler()));
|
||||||
ServiceProvider tempServiceProvider = services.BuildServiceProvider();
|
ServiceProvider tempServiceProvider = services.BuildServiceProvider();
|
||||||
|
|||||||
@ -255,7 +255,7 @@ public class CajetanApiService(IAuthService authService, IConfigService configSe
|
|||||||
|
|
||||||
Log.Debug("Calling GetAllSubscrptions");
|
Log.Debug("Calling GetAllSubscrptions");
|
||||||
|
|
||||||
const int limit = 25;
|
const int limit = 30;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
|
|
||||||
Dictionary<string, string> getParams = new()
|
Dictionary<string, string> getParams = new()
|
||||||
@ -295,13 +295,13 @@ public class CajetanApiService(IAuthService authService, IConfigService configSe
|
|||||||
|
|
||||||
if (!isRestricted || isRestrictedButAllowed)
|
if (!isRestricted || isRestrictedButAllowed)
|
||||||
users.Add(item.Username, item.Id);
|
users.Add(item.Username, item.Id);
|
||||||
|
}
|
||||||
|
|
||||||
if (subscriptionsDto.HasMore is false)
|
if (subscriptionsDto.HasMore is false)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
offset += limit;
|
offset += limit;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return users;
|
return users;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,11 @@
|
|||||||
using OF_DL.Enumerations;
|
|
||||||
using Serilog;
|
|
||||||
using Serilog.Core;
|
using Serilog.Core;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
|
|
||||||
namespace OF_DL.Services;
|
namespace OF_DL.Services;
|
||||||
|
|
||||||
public class SeqLoggingService : ILoggingService
|
public class CajetanLoggingService : ILoggingService
|
||||||
{
|
{
|
||||||
public SeqLoggingService()
|
public CajetanLoggingService()
|
||||||
{
|
{
|
||||||
LevelSwitch = new LoggingLevelSwitch();
|
LevelSwitch = new LoggingLevelSwitch();
|
||||||
InitializeLoggerWithSeq();
|
InitializeLoggerWithSeq();
|
||||||
@ -35,15 +33,21 @@ public class SeqLoggingService : ILoggingService
|
|||||||
|
|
||||||
private void InitializeLoggerWithSeq()
|
private void InitializeLoggerWithSeq()
|
||||||
{
|
{
|
||||||
Log.Logger = new LoggerConfiguration()
|
LevelSwitch.MinimumLevel = LogEventLevel.Warning;
|
||||||
|
|
||||||
|
LoggerConfiguration loggerConfig = new LoggerConfiguration()
|
||||||
.Enrich.FromLogContext()
|
.Enrich.FromLogContext()
|
||||||
.Enrich.WithProperty("Application", "OF_DL")
|
.Enrich.WithProperty("Application", "OF_DL")
|
||||||
.Enrich.WithProperty("StartTime", $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} ")
|
.Enrich.WithProperty("StartTime", $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} ")
|
||||||
.Enrich.WithProperty("MachineName", Environment.MachineName)
|
.Enrich.WithProperty("MachineName", Environment.MachineName)
|
||||||
.MinimumLevel.ControlledBy(LevelSwitch)
|
.MinimumLevel.Verbose()
|
||||||
.WriteTo.File("logs/OFDL.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error)
|
.WriteTo.File("logs/OFDL.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error, levelSwitch: LevelSwitch)
|
||||||
.WriteTo.Seq("https://seq.cajetan.dk")
|
.WriteTo.Seq("https://seq.cajetan.dk", controlLevelSwitch: LevelSwitch);
|
||||||
.CreateLogger();
|
|
||||||
|
if (System.Diagnostics.Debugger.IsAttached)
|
||||||
|
loggerConfig.WriteTo.Debug(restrictedToMinimumLevel: LogEventLevel.Debug);
|
||||||
|
|
||||||
|
Log.Logger = loggerConfig.CreateLogger();
|
||||||
|
|
||||||
Log.Debug("Logging service initialized");
|
Log.Debug("Logging service initialized");
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user