diff options
| author | crobibero <cody@robibe.ro> | 2020-08-17 15:54:40 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-17 15:54:40 -0600 |
| commit | 29d8e3816135b1af926eaf9c44f96638ce5956fe (patch) | |
| tree | 813280744e6e5542fc595287d7991c2a7bdf1779 /Jellyfin.Server/Program.cs | |
| parent | 7861c72754172a1d2ebaffdde861fd614fa65488 (diff) | |
| parent | d0f49b39945424e5d2a8697ea551055ce26cf758 (diff) | |
Merge remote-tracking branch 'upstream/master' into fixes
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 9fd706d36..f6ac4e2a3 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -344,11 +344,24 @@ namespace Jellyfin.Server } } - // Bind to unix socket (only on OSX and Linux) - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + // Bind to unix socket (only on macOS and Linux) + if (startupConfig.UseUnixSocket() && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // TODO: allow configuration of socket path - var socketPath = $"{appPaths.DataPath}/socket.sock"; + var socketPath = startupConfig.GetUnixSocketPath(); + if (string.IsNullOrEmpty(socketPath)) + { + var xdgRuntimeDir = Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR"); + if (xdgRuntimeDir == null) + { + // Fall back to config dir + socketPath = Path.Join(appPaths.ConfigurationDirectoryPath, "socket.sock"); + } + else + { + socketPath = Path.Join(xdgRuntimeDir, "jellyfin-socket"); + } + } + // Workaround for https://github.com/aspnet/AspNetCore/issues/14134 if (File.Exists(socketPath)) { |