Compare commits

...

1 Commits

Author SHA1 Message Date
z__
ba5b611994 add STA thread back, not being added automatically on local build 2022-02-04 10:38:47 +07:00

View File

@@ -7,6 +7,7 @@ namespace Torch.Server
{ {
internal static class Program internal static class Program
{ {
[STAThread]
public static void Main(string[] args) public static void Main(string[] args)
{ {
var isService = Environment.GetEnvironmentVariable("TORCH_SERVICE") var isService = Environment.GetEnvironmentVariable("TORCH_SERVICE")
@@ -23,8 +24,6 @@ namespace Torch.Server
File.Delete(file); File.Delete(file);
} }
TorchLauncher.Launch(workingDir, binDir);
// Breaks on Windows Server 2019 // Breaks on Windows Server 2019
#if TORCH_SERVICE #if TORCH_SERVICE
if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive) if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive)
@@ -45,7 +44,7 @@ namespace Torch.Server
} }
else else
{ {
instancePath = Path.GetFullPath(instanceName); instancePath = Directory.CreateDirectory(instanceName).FullName;
} }
var oldTorchCfg = Path.Combine(workingDir, "Torch.cfg"); var oldTorchCfg = Path.Combine(workingDir, "Torch.cfg");
@@ -70,6 +69,8 @@ namespace Torch.Server
if (!initializer.Initialize(args)) if (!initializer.Initialize(args))
Environment.Exit(1); Environment.Exit(1);
TorchLauncher.Launch(workingDir, binDir);
CopyNative(binDir); CopyNative(binDir);
initializer.Run(isService, instanceName, instancePath); initializer.Run(isService, instanceName, instancePath);
} }