Update logging configuration in Program.cs

Modified logging setup to use NLog only in non-development environments, while maintaining trace-level logging for development.
Bump version to 1.2.0 in project file
2025-05-11 11:14:19 +02:00 · 2025-05-11 10:51:16 +02:00 · 2025-05-09 23:21:28 +02:00 · 2025-05-09 23:20:27 +02:00 · 2025-05-09 23:19:23 +02:00 · 2025-05-05 10:16:27 +02:00
8 changed files with 421 additions and 33 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}
--- a/DigitalData.Gateway.csproj
+++ b/DigitalData.Gateway.csproj
@@ -1,16 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.0</Version>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-    <FileVersion>1.0.0</FileVersion>
+    <Version>1.2.0</Version>
+    <AssemblyVersion>1.2.0</AssemblyVersion>
+    <FileVersion>1.2.0</FileVersion>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Ocelot" Version="22.0.1" />
+    <PackageReference Include="NLog" Version="5.4.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
+    <PackageReference Include="Ocelot" Version="23.4.3" />
  </ItemGroup>

 </Project>
--- a/Program.cs
+++ b/Program.cs
@@ -1,26 +1,46 @@
+using NLog;
+using NLog.Web;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;

-var builder = WebApplication.CreateBuilder(args);
+var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
+logger.Info("Logging initialized.");

-// Make sure to add the Ocelot configuration file
-builder.Configuration.AddJsonFile("ocelot.json");
-
-// Add Ocelot services
-builder.Services.AddOcelot();
-
-var app = builder.Build();
-
-app.UseHttpsRedirection();
-app.UseRouting();
-app.UseAuthorization();
-
-// Use Ocelot middleware in an appropriate way
-app.UseEndpoints(endpoints =>
+try
 {
-    endpoints.MapControllers();
-});
+    var builder = WebApplication.CreateBuilder(args);

-app.UseOcelot().Wait();
+    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);

-app.Run();
+    if (!builder.Environment.IsDevelopment())
+    {
+        builder.Logging.ClearProviders();
+        builder.Host.UseNLog();
+    }
+
+    // Make sure to add the Ocelot configuration file
+    var suffix = builder.Environment.IsDevelopment() ? ".Development" : "";
+    builder.Configuration.AddJsonFile($"ocelot{suffix}.json");
+
+    // Add Ocelot services
+    builder.Services.AddOcelot();
+
+    var app = builder.Build();
+
+    app.UseHttpsRedirection();
+    app.UseRouting();
+    app.UseAuthorization();
+
+    // Use Ocelot middleware in an appropriate way
+    app.MapControllers();
+
+    app.UseOcelot().Wait();
+
+    app.Run();
+
+}
+catch(Exception ex)
+{
+    logger.Error(ex, "Stopped program because of exception.");
+    throw;
+}
--- a/Properties/PublishProfiles/IISProfileNet9Win64.pubxml
+++ b/Properties/PublishProfiles/IISProfileNet9Win64.pubxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>329f45bf-4c79-4a7b-9086-d6205617aa42</ProjectGuid>
+    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\Gateway\EnvelopeGeneratorGen\Net9Win64\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Gateway</DeployIisAppPath>
+    <_TargetId>IISWebDeployPackage</_TargetId>
+    <TargetFramework>net9.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -23,7 +23,7 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": true,
-      "launchUrl": "swagger",
+      "launchUrl": "swagger/index.html",
      "applicationUrl": "https://localhost:7052;http://localhost:5028",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
--- a/appsettings.json
+++ b/appsettings.json
@@ -5,5 +5,48 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "NLog": {
+    "throwConfigExceptions": true,
+    "variables": {
+      "logDirectory": "E:\\LogFiles\\Digital Data\\workFlow.Gateway",
+      "logFileNamePrefix": "${shortdate}-workFlow.Gateway"
+    },
+    "targets": {
+      "infoLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
+        "maxArchiveDays": 30
+      },
+      "errorLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
+        "maxArchiveDays": 30
+      },
+      "criticalLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Critical.log",
+        "maxArchiveDays": 30
+      }
+    },
+    // Trace, Debug, Info, Warn, Error and *Fatal*
+    "rules": [
+      {
+        "logger": "*",
+        "minLevel": "Info",
+        "maxLevel": "Warn",
+        "writeTo": "infoLogs"
+      },
+      {
+        "logger": "*",
+        "level": "Error",
+        "writeTo": "errorLogs"
+      },
+      {
+        "logger": "*",
+        "level": "Fatal",
+        "writeTo": "criticalLogs"
+      }
+    ]
+  }
 }
--- a/ocelot.Development.json
+++ b/ocelot.Development.json
@@ -0,0 +1,159 @@
+{
+  "Routes": [
+    {
+      "DownstreamPathTemplate": "/swagger/{route}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/swagger/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/swagger/{route1}/{route2}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/swagger/{route1}/{route2}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar/{route}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar/{route1}/{route2}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar/{route1}/{route2}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie={cookie}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7192
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth?cookie={cookie}",
+      "UpstreamHttpMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/sign-flow-gen?cookie=false",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7192
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth",
+      "UpstreamHttpMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/sign-flow-gen/login",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 7192
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth/form",
+      "UpstreamHttpMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route}/{id}",
+      "DownstreamScheme": "https",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route}{id}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Delete"
+      ]
+    }
+  ],
+  "GlobalConfiguration": {
+  }
+}
--- a/ocelot.json
+++ b/ocelot.json
@@ -1,19 +1,147 @@
 {
  "Routes": [
    {
-      "DownstreamPathTemplate": "/swagger/index.html",
-      "DownstreamScheme": "https",
+      "DownstreamPathTemplate": "/swagger/{route}",
+      "DownstreamScheme": "http",
      "DownstreamHostAndPorts": [
        {
          "Host": "localhost",
-          "Port": 7192
+          "Port": 8088
        }
      ],
-      "UpstreamPathTemplate": "/auth-swagger",
-      "UpstreamHttpMethod": [ "Get" ]
+      "UpstreamPathTemplate": "/swagger/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/swagger/{route1}/{route2}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/swagger/{route1}/{route2}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar/{route}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/scalar/{route1}/{route2}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/scalar/{route1}/{route2}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/work-flow?cookie=false",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth",
+      "UpstreamHttpMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/Auth/check",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/Auth/check",
+      "UpstreamHttpMethod": [ "Post" ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Post",
+        "Put",
+        "Delete"
+      ]
+    },
+    {
+      "DownstreamPathTemplate": "/api/{route}/{id}",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 8088
+        }
+      ],
+      "UpstreamPathTemplate": "/api/{route}{id}",
+      "UpstreamHttpMethod": [
+        "Get",
+        "Delete"
+      ]
    }
  ],
  "GlobalConfiguration": {
-    "BaseUrl": "https://localhost:7052"
  }
 }
Author	SHA1	Message	Date
Developer 02	941e47ba3e	Update logging configuration in Program.cs Modified logging setup to use NLog only in non-development environments, while maintaining trace-level logging for development.	2025-05-11 11:14:19 +02:00
Developer 02	a76afdda34	Bump version to 1.2.0 in project file Updated the `DigitalData.Gateway.csproj` to reflect new versioning information, changing `Version`, `AssemblyVersion`, and `FileVersion` from `1.1.0` to `1.2.0`.	2025-05-11 10:51:16 +02:00
Developer 02	0d0e4675ad	Merge branch 'master' into feat/envelope-generator.gen.api	2025-05-09 23:21:28 +02:00
Developer 02	6ade388cd7	Enhance logging configuration in Program.cs Initialized logging by clearing providers, setting minimum level to Trace, and configuring NLog as the logging provider.	2025-05-09 23:20:27 +02:00
Developer 02	5f21002e4f	Update port configuration in ocelot.Development.json Changed the `Port` number for `DownstreamHostAndPorts` from `7174` to `8088` across multiple route definitions. Updated `DownstreamPathTemplate` and `UpstreamPathTemplate` for paths including `/swagger/{route}`, `/scalar`, and `/api/{route}`. Corrected the `UpstreamPathTemplate` for `/api/{route}/{id}` by removing an unnecessary slash before `{id}`.	2025-05-09 23:19:23 +02:00
Developer 02	6be3d5373a	Update API routing and port configuration - Changed `DownstreamPathTemplate` from `/api/Auth/check` to `/api/Auth/sign-flow-gen/login`. - Updated `DownstreamHostAndPorts` port from `7174` to `7192`. - Modified `UpstreamPathTemplate` from `/api/Auth/check` to `/api/Auth/form`.	2025-05-05 10:16:27 +02:00
Developer 02	d34ba75deb	refactor(ocelot.json): DownstreamPathTemplate des Authentifizierungsdienstes konfiguriert, um sign-flow-gen als Verbraucher hinzuzufügen und den Parameter cookie-query optional zu machen. - Ent-Punkt hinzufügen, um den Standard-Cookie-Parameter falsch zu machen.	2025-04-29 11:17:10 +02:00
Developer 02	dccaaf2feb	chore(IISProfile): DesktopBuildPackageLocation-Pfad aktualisieren	2025-04-08 15:39:29 +02:00
Developer 02	1957626ef2	Bump version to 1.1.0 in project file Updated the `DigitalData.Gateway.csproj` to reflect the new versioning information, changing `Version`, `AssemblyVersion`, and `FileVersion` from `1.0.0` to `1.1.0`. This release may include new features or fixes.	2025-04-08 15:34:24 +02:00
Developer 02	7069938d34	merge	2025-04-08 15:31:49 +02:00
Developer 02	23e73aae19	IISProfile aktualisieren	2025-04-08 15:30:21 +02:00
Developer 02	23d73e0671	gitignore aktualisiert	2025-04-08 15:29:26 +02:00
Developer 02	84a25752b5	Merge branch 'master' into feat/envelope-generator.gen.api	2025-04-08 11:07:33 +02:00
Developer 02	72b1c58b72	chore: Aktualisierung der Ziel-Frameworks in der Projektdatei Geänderte `DigitalData.Gateway.csproj` zur Unterstützung mehrerer Ziel-Frameworks: `net7.0`, `net8.0` und `net9.0`. Diese verbessert die Kompatibilität und Flexibilität des Projekts.	2025-04-08 10:53:23 +02:00
Developer 02	4173c3d96a	Aktualisierung der Ocelot-Paketversion in der Projektdatei Die Projektdatei `DigitalData.Gateway.csproj` wurde geändert, um das `Ocelot`-Paket von Version `22.0.1` auf `23.4.3` zu aktualisieren. Außerdem wurde eine kleine Formatierungsänderung am `<Project>`-Tag vorgenommen, der nun ein nicht sichtbares Zeichen am Anfang der Zeile enthält.	2025-04-08 10:50:49 +02:00
Developer 02	693a835191	Update routing and configuration for EnvelopeGeneratorGenApi - Changed `DesktopBuildPackageLocation` in `IISProfile.pubxml` to point to the new `EnvelopeGeneratorGenApi` project directory. - Updated routing in `ocelot.Development.json` and `ocelot.json`: - Changed `DownstreamScheme` from `https` to `http` for multiple routes. - Updated `Port` for `DownstreamHostAndPorts` from `7120` and `7192` to `8088`. - Expanded `UpstreamHttpMethod` to include `Post`, `Put`, and `Delete`. - Added new routes for `/scalar`, `/scalar/{route}`, and `/scalar/{route1}/{route2}`. - Modified `GlobalConfiguration` `BaseUrl` from `https://localhost:7052` to `http://localhost:8443`.	2025-04-08 10:44:46 +02:00
Developer 02	8a8f77c4d5	chore: port aktualisiert.	2025-03-24 14:55:35 +01:00
Developer 02	08e3cdddb0	chore: IIS-Profil zu git hinzufügen, um es für Zweige anpassen zu können	2025-03-11 17:14:07 +01:00
Developer 02	e1bd477753	refactor(ocelet.json): konfiguriert	2025-03-11 17:08:53 +01:00
Developer 02	174338af5d	Refaktor: Aktualisierung der Endpunktzuordnung auf moderne Syntax zur verbesserten Klarheit	2025-03-11 16:55:34 +01:00
Developer 02	e3be4f5e6f	chore(ocelet.Development): Anordnen von Ports und Authentifizierungsendpunkten.	2025-03-11 16:46:35 +01:00
Developer 02	cbd3accf72	feat: Logging für unerwartete Ausnahmen hinzugefügt, um eine bessere Fehlerverfolgung und Problemlösung zu gewährleisten.	2025-03-10 15:42:22 +01:00
Developer 02	d108978b63	feat: NLog hinzugefügt und über App-Einstellungen konfiguriert	2025-03-10 15:00:34 +01:00
Developer 02	6a536e950d	feat: Ocelot-Konfigurationsdatei für die Entwicklung hinzugefügt.	2025-03-10 14:33:30 +01:00
Developer 02	0efb035d12	refactor(ocelot.json): Aktualisiert, um mit workFlow.API zu konfigurieren	2025-01-16 12:07:31 +01:00