Skip to content

Commit 9cbfe75

Browse files
committed
Log build log on error when sentry integration is disabled
Change default configuration to work on linux
1 parent 23ee477 commit 9cbfe75

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

SS14.MapServer/BuildRunners/LocalBuildService.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ private void LogOutput(StringBuilder logBuffer, DataReceivedEventArgs args)
146146
private void ProcessLocalBuildException(string log, string fileName, Exception exception)
147147
{
148148
if (!SentrySdk.IsEnabled)
149+
{
150+
_log.Error("Build error detected. Log:\n{Log}", log);
149151
throw exception;
152+
}
150153

151154
var data = Encoding.UTF8.GetBytes(log);
152155
SentrySdk.CaptureException(exception,

SS14.MapServer/Configuration/BuildConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public sealed class BuildConfiguration
88
public BuildRunnerName Runner { get; set; } = BuildRunnerName.Local;
99
public string RelativeOutputPath { get; set; } = "bin";
1010
public string MapRendererProjectName { get; set; } = "Content.MapRenderer";
11-
public string MapRendererCommand { get; set; } = "Content.MapRenderer.exe";
11+
public string MapRendererCommand { get; set; } = "Content.MapRenderer";
1212
public string MapRendererOptionsString { get; set; } = "--format webp --viewer -f";
1313
public int ProcessTimeoutMinutes { get; set; } = 10;
1414
public string RelativeMapFilesPath { get; set; } = "Resources/MapImages";

SS14.MapServer/SS14.MapServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
8-
<Version>1.1.11</Version>
8+
<Version>1.1.12</Version>
99
</PropertyGroup>
1010

1111
<ItemGroup>

SS14.MapServer/appsettings.Development.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ Server:
2727

2828
Git:
2929
Branch: "master"
30+
31+
Build:
32+
MapRendererCommand: "Content.MapRenderer.exe"

0 commit comments

Comments
 (0)