cleanup

Koenkk · Feb 23, 2025 · fd76051 · fd76051
1 parent b8eae3e
commit fd76051
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/lib/controller.ts b/lib/controller.ts
@@ -212,7 +212,7 @@ export class Controller {
     }
 
     async stop(restart = false): Promise<void> {
-        this.sdNotify?.stopping();
+        this.sdNotify?.notifyStopping();
 
         // Call extensions
         await this.callExtensions('stop', this.extensions);

diff --git a/lib/util/sd-notify.ts b/lib/util/sd-notify.ts
@@ -6,7 +6,7 @@ import logger from './logger';
  * Handle sd_notify protocol, @see https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html
  * No-op if running on unsupported platforms or without Type=notify
  */
-export async function initSdNotify(): Promise<{stopping: () => void; stop: () => void} | undefined> {
+export async function initSdNotify(): Promise<{notifyStopping: () => void; stop: () => void} | undefined> {
     if (!process.env.NOTIFY_SOCKET) {
         return;
     }
@@ -23,7 +23,7 @@ export async function initSdNotify(): Promise<{stopping: () => void; stop: () =>
                 }
             });
         };
-        const stopping = (): void => sendToSystemd('STOPPING=1');
+        const notifyStopping = (): void => sendToSystemd('STOPPING=1');
 
         sendToSystemd('READY=1');
 
@@ -34,7 +34,7 @@ export async function initSdNotify(): Promise<{stopping: () => void; stop: () =>
             const watchdogInterval = setInterval(() => sendToSystemd('WATCHDOG=1'), wdUSec / 1000 / 2);
 
             return {
-                stopping,
+                notifyStopping,
                 stop: (): void => clearInterval(watchdogInterval),
             };
         }
@@ -44,15 +44,13 @@ export async function initSdNotify(): Promise<{stopping: () => void; stop: () =>
         }
 
         return {
-            stopping,
+            notifyStopping,
             stop: (): void => {},
         };
     } catch (error) {
-        console.log('1');
         // Ignore error on Windows if not running on WSL, as UNIX sockets don't exist on Windows.
         // Unlikely that NOTIFY_SOCKET is set anyways but better be safe.
         if (platform() !== 'win32' || process.env.WSL_DISTRO_NAME) {
-            console.log('2');
             throw error;
         }
     }

diff --git a/test/sd-notify.test.ts b/test/sd-notify.test.ts
@@ -97,7 +97,7 @@ describe('sd-notify', () => {
 
         await vi.advanceTimersByTimeAsync(7500);
 
-        res!.stopping();
+        res!.notifyStopping();
         expect(mockUnixDgramSocket.send).toHaveBeenCalledTimes(2);
         expectSocketNthSend(2, 'STOPPING=1');
 
@@ -116,7 +116,7 @@ describe('sd-notify', () => {
 
         await vi.advanceTimersByTimeAsync(7500);
 
-        res!.stopping();
+        res!.notifyStopping();
         expect(mockUnixDgramSocket.send).toHaveBeenCalledTimes(2);
         expectSocketNthSend(2, 'STOPPING=1');
 
@@ -137,7 +137,7 @@ describe('sd-notify', () => {
         expect(mockUnixDgramSocket.send).toHaveBeenCalledTimes(2);
         expectSocketNthSend(2, 'WATCHDOG=1');
 
-        res!.stopping();
+        res!.notifyStopping();
         expect(mockUnixDgramSocket.send).toHaveBeenCalledTimes(3);
         expectSocketNthSend(3, 'STOPPING=1');