Merge branch 'main' of https://github.com/Fetcharr/fetcharr

Fetcharr · Sep 9, 2024 · f623e83 · f623e83
2 parents 2087d6e + 078acd1
commit f623e83
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 36 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,6 +34,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and release
-        run: ./build.cmd Release
+        run: ./build.cmd Release --push-image --include-integration-tests
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/docs/getting-started/installation.mdx b/docs/docs/getting-started/installation.mdx
@@ -12,7 +12,7 @@ Lists all the available options for installing/building Fetcharr. Some of these
 
 :::warning
 
-**Fetcharr is still early in development.** If you would like to help test the bleeding edge, please use the image `fetcharr/fetcharr:develop`!
+**Fetcharr is still early in development.** If you would like to help test the bleeding edge, please use the image `ghcr.io/fetcharr/fetcharr:develop`!
 
 :::
 
@@ -34,7 +34,7 @@ Be sure to replace `/path/to/appdata/config` with a valid host directory path. I
         -e TZ=Europe/Copenhagen \
         -v /path/to/appdata/config:/config \
         --restart unless-stopped \
-        fetcharr/fetcharr:latest
+        ghcr.io/fetcharr/fetcharr:latest
     ```
   </TabItem>
   <TabItem value="docker-compose" label="Docker Compose">
@@ -43,7 +43,7 @@ Be sure to replace `/path/to/appdata/config` with a valid host directory path. I
     ```yaml title="compose.yaml"
     services:
         fetcharr:
-            image: fetcharr/fetcharr:latest
+            image: ghcr.io/fetcharr/fetcharr:latest
             container_name: fetcharr
             environment:
             - TZ=Europe/Copenhagen
@@ -84,4 +84,4 @@ Afterwards, build the Docker image using [NUKE](https://nuke.build):
 
 You don't need to have NUKE installed for `build.cmd` to work.
 
-:::
+:::
diff --git a/src/API/src/Fetcharr.API.csproj b/src/API/src/Fetcharr.API.csproj
@@ -9,6 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Serilog" />
+    <PackageReference Include="Serilog.AspNetCore" />
+    <PackageReference Include="Serilog.Sinks.Console" />
+    <PackageReference Include="Serilog.Sinks.File" />
     <PackageReference Include="YamlDotNet" />
 
     <PackageReference Include="GitVersion.MsBuild">

diff --git a/src/API/src/Program.cs b/src/API/src/Program.cs
@@ -1,11 +1,11 @@
 using Fetcharr.API.Extensions;
-using Fetcharr.API.Services;
 using Fetcharr.Cache.Core.Extensions;
 using Fetcharr.Cache.Hybrid.Extensions;
 using Fetcharr.Cache.InMemory.Extensions;
-using Fetcharr.Configuration.Extensions;
-using Fetcharr.Models.Extensions;
-using Fetcharr.Shared.Http.Extensions;
+using Fetcharr.Models.Configuration;
+
+using Serilog;
+using Serilog.Events;
 
 namespace Fetcharr.API
 {
@@ -15,13 +15,31 @@ static async Task Main(string[] args)
         {
             WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
-            builder.Services.AddLogging(opts =>
-                opts.AddSimpleConsole(options =>
+            builder.Host.UseSerilog((context, serviceProvider, configuration) =>
+            {
+                IAppDataSetup appDataSetup = serviceProvider.GetRequiredService<IAppDataSetup>();
+
+                configuration.MinimumLevel.Warning();
+                configuration.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Error);
+                configuration.MinimumLevel.Override("Microsoft.Hosting", LogEventLevel.Information);
+                configuration.MinimumLevel.Override("Fetcharr", LogEventLevel.Information);
+
+                if(context.HostingEnvironment.IsDevelopment())
+                {
+                    configuration.MinimumLevel.Information();
+                    configuration.MinimumLevel.Override("Fetcharr", LogEventLevel.Verbose);
+                    configuration.MinimumLevel.Override("Fetcharr.Cache", LogEventLevel.Information);
+                }
+
+                configuration.WriteTo.Console();
+
+                if(context.HostingEnvironment.IsProduction())
                 {
-                    options.IncludeScopes = true;
-                    options.SingleLine = true;
-                    options.TimestampFormat = "HH:mm:ss ";
-                }));
+                    configuration.WriteTo.File(
+                        $"{appDataSetup.LogDirectory}/fetcharr.log",
+                        rollingInterval: RollingInterval.Day);
+                }
+            });
 
             builder.Services.AddCaching(opts => opts
                 .UseHybrid("metadata", opts => opts.SQLite.DatabasePath = "metadata.sqlite")

diff --git a/src/API/src/appsettings.Development.json b/src/API/src/appsettings.Development.json
diff --git a/src/API/src/appsettings.json b/src/API/src/appsettings.json
@@ -5,13 +5,5 @@
         "Url": "http://0.0.0.0:8080"
       }
     }
-  },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning",
-      "Microsoft.AspNetCore": "None",
-      "Microsoft.Hosting": "Information",
-      "Fetcharr": "Information"
-    }
   }
 }
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -25,6 +25,10 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Serilog" Version="4.0.1" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="YamlDotNet" Version="16.0.0" />
   </ItemGroup>
 

diff --git a/src/Models/src/Configuration/AppDataSetup.cs b/src/Models/src/Configuration/AppDataSetup.cs
@@ -21,6 +21,11 @@ public interface IAppDataSetup
         ///   Gets the base location for configurations.
         /// </summary>
         string ConfigDirectory { get; }
+
+        /// <summary>
+        ///   Gets the base location for runtime logs.
+        /// </summary>
+        string LogDirectory { get; }
     }
 
     /// <summary>
@@ -41,6 +46,11 @@ public class EnvironmentalAppDataSetup : IAppDataSetup
             Environment.GetEnvironmentVariable("FETCHARR_CONFIG_DIR") ??
             Path.Join(this.BaseDirectory, "config");
 
+        /// <inheritdoc />
+        public string LogDirectory =>
+            Environment.GetEnvironmentVariable("FETCHARR_LOG_DIR") ??
+            Path.Join(this.BaseDirectory, "logs");
+
         public EnvironmentalAppDataSetup()
         {
             Directory.CreateDirectory(this.BaseDirectory);