Rhino8 Net7 -> Net4.8 (#3625)

* Net7 -> Net4.8 * Removed serilog enriching for netframework compat * fix: docker-compose.yml updates --------- Co-authored-by: Alan Rynne <[email protected]>
specklesystems · Sep 13, 2024 · 25483ad · 25483ad
1 parent d8e58c9
commit 25483ad
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/ConnectorRhino/ConnectorRhino8/ConnectorRhino8.csproj b/ConnectorRhino/ConnectorRhino8/ConnectorRhino8.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0-windows;net48</TargetFrameworks>
+    <TargetFramework>net48</TargetFramework>
     <Title>SpeckleRhino</Title>
     <Description>Description of SpeckleRhino</Description>
     <TargetExt>.rhp</TargetExt>

diff --git a/Core/Core/Core.csproj b/Core/Core/Core.csproj
@@ -49,7 +49,6 @@
     <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
     <PackageReference Include="SerilogTimings" Version="3.0.1" />

diff --git a/Core/Core/Logging/SpeckleLog.cs b/Core/Core/Logging/SpeckleLog.cs
@@ -6,7 +6,6 @@
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;
-using Serilog.Exceptions;
 using Speckle.Core.Credentials;
 using Speckle.Core.Helpers;
 
@@ -180,10 +179,10 @@ SpeckleLogConfiguration logConfiguration
       .Enrich.WithProperty("runtime", RuntimeInformation.FrameworkDescription)
       .Enrich.WithProperty("hostApplication", $"{hostApplicationName}{hostApplicationVersion ?? ""}");
 
-    if (logConfiguration.EnhancedLogContext)
-    {
-      serilogLogConfiguration = serilogLogConfiguration.Enrich.WithExceptionDetails();
-    }
+    // if (logConfiguration.EnhancedLogContext)
+    // {
+    //   serilogLogConfiguration = serilogLogConfiguration.Enrich.WithExceptionDetails();
+    // }
 
     if (logConfiguration.LogToFile && canLogToFile)
     {

diff --git a/Core/docker-compose.yml b/Core/docker-compose.yml
@@ -65,15 +65,14 @@ services:
     restart: always
     healthcheck:
       test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/graphql?query={serverInfo{version}}', method: 'GET' }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end();",
-        ]
+        - CMD
+        - /nodejs/bin/node
+        - -e
+        - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/readiness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end(); } catch { process.exit(1); }"
       interval: 10s
-      timeout: 3s
-      retries: 30
+      timeout: 10s
+      retries: 3
+      start_period: 90s
     ports:
       - "0.0.0.0:3000:3000"
     depends_on:

diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhino8/ConverterRhino8.csproj b/Objects/Converters/ConverterRhinoGh/ConverterRhino8/ConverterRhino8.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <Title>Objects.Converter.Rhino8</Title>
     <Description>Converter for Rhino and Grasshopper</Description>
     <TargetExt>.dll</TargetExt>