Run as a service on macOS

Azure · Mar 22, 2024 · b1de038 · b1de038
1 parent 89b5018
commit b1de038
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 3 deletions.
diff --git a/build/repo.props b/build/repo.props
@@ -14,6 +14,9 @@
 	<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('linux'))">
 		<DefineConstants>_SYSTEMD</DefineConstants>
 	</PropertyGroup>
+	<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith('osx'))">
+		<DefineConstants>_LAUNCHD</DefineConstants>
+	</PropertyGroup>
 	<ItemGroup>
 		<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
 	</ItemGroup>

diff --git a/src/azbridge/Program.cs b/src/azbridge/Program.cs
@@ -54,7 +54,7 @@ static int Run(CommandLineSettings settings, string[] args)
                     return 0;
                 }
 #endif
-#if _WINDOWS || _SYSTEMD
+#if _WINDOWS || _SYSTEMD || _LAUNCHD
                 if (settings.ServiceRun.HasValue && settings.ServiceRun.Value)
                 {
                     ServiceLauncher.RunAsync(settings).GetAwaiter().GetResult();

diff --git a/src/azbridge/RelayBridgeService.cs b/src/azbridge/RelayBridgeService.cs
@@ -1,4 +1,4 @@
-#if _WINDOWS || _SYSTEMD
+#if _WINDOWS || _SYSTEMD || _LAUNCHD
 using Microsoft.Azure.Relay.Bridge.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

diff --git a/src/azbridge/ServiceLauncher.cs b/src/azbridge/ServiceLauncher.cs
@@ -1,14 +1,15 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if _WINDOWS || _SYSTEMD
+#if _WINDOWS || _SYSTEMD || _LAUNCHD
 namespace azbridge
 {
     using Microsoft.Azure.Relay.Bridge.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Logging.Configuration;
+    using Microsoft.Extensions.Logging.Console;
     using Microsoft.Extensions.Logging.EventLog;
     using System;
     using System.Collections;
@@ -95,6 +96,8 @@ internal static async Task RunAsync(CommandLineSettings settings)
                 })
 #elif _SYSTEMD
                 .UseSystemd()
+#elif _LAUNCHD
+                .UseLaunchd()
 #endif
 
                 .ConfigureServices(services =>
@@ -183,6 +186,23 @@ internal static bool IsInstalled()
              return true;
 #endif
         }
+
+        private static IHostBuilder UseLaunchd(this IHostBuilder hostBuilder)
+        {
+            hostBuilder.ConfigureServices(services =>
+            {
+                services.Configure<ConsoleLoggerOptions>(options =>
+                {
+                    options.FormatterName = ConsoleFormatterNames.Simple;
+                });
+                services.Configure<SimpleConsoleFormatterOptions>(options =>
+                {
+                    options.SingleLine = true;
+                });
+            });
+
+            return hostBuilder;
+        }
     }
 }
 #endif
diff --git a/src/azbridge/azbridge.csproj b/src/azbridge/azbridge.csproj
@@ -66,6 +66,9 @@
 		<Content Include="azbridge.service" CopyToPublishDirectory="PreserveNewest" Condition="$(DefineConstants.Contains('_SYSTEMD'))">
 			<LinuxPath>/etc/systemd/system/azbridge.service</LinuxPath>
 		</Content>
+		<Content Include="azbridge.plist" CopyToPublishDirectory="PreserveNewest" Condition="$(DefineConstants.Contains('_LAUNCHD'))">
+			<LinuxPath>/Library/LaunchDaemons/com.azure.relay.bridge.plist</LinuxPath>
+		</Content>
 		<Content Include="azbridge.sh" CopyToPublishDirectory="PreserveNewest" Condition="! $(RuntimeIdentifier.StartsWith('win'))" RemoveOnUninstall="true">
 			<LinuxPath>/etc/profile.d/azbridge.sh</LinuxPath>
 			<LinuxFileMode Condition="$(RuntimeIdentifier.StartsWith('linux'))">0555</LinuxFileMode>

diff --git a/src/azbridge/azbridge.plist b/src/azbridge/azbridge.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>com.azure.relay.bridge</string>
+	<key>ProgramArguments</key>
+        <array>
+            <string>/usr/local/share/azbridge/azbridge</string>
+	        <string>--svc</string>
+        </array>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>KeepAlive</key>
+	<dict>
+		 <key>Crashed</key>
+		 <true/>
+	</dict>
+	<key>StandardOutPath</key>
+	<string>/var/log/azbridge.log</string>
+	<key>StandardErrorPath</key>
+	<string>/var/log/azbridge.log</string>
+</dict>
+</plist>