Add more logging to cleanup code

zombiezen · Nov 12, 2023 · 19f50a9 · 19f50a9
1 parent 162f1a8
commit 19f50a9
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,4 +63,4 @@ jobs:
           secret_keys: ${{ secrets.NIX_PRIVATE_KEY }}
           use_nixcached: true
       - name: nix build
-        run: nix build '.#nodejs'
+        run: nix build '.#devShells.x86_64-linux.default'
diff --git a/dist/cleanup.js b/dist/cleanup.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -25,6 +25,7 @@ import {
   SYSTEMD_DROPIN_STATE,
   SERVICES_STATE,
   runCommand,
+  UPLOAD_SERVICE_UNIT,
 } from './common';
 
 (async () => {
@@ -36,6 +37,13 @@ import {
         servicesStarted instanceof Array &&
         servicesStarted.every((x) => typeof x === 'string')
       ) {
+        if (servicesStarted.indexOf(UPLOAD_SERVICE_UNIT) >= 0) {
+          await runCommand([
+            'journalctl',
+            `--user-unit=${UPLOAD_SERVICE_UNIT}`,
+          ]);
+        }
+        info(`Stopping systemd services ${servicesStarted.join()}...`);
         await runCommand(['systemctl', 'stop', '--user', ...servicesStarted]);
       }
     }

diff --git a/src/common.ts b/src/common.ts
@@ -20,6 +20,8 @@ export const TEMP_DIR_STATE = 'tempdir';
 export const SYSTEMD_DROPIN_STATE = 'systemd';
 export const SERVICES_STATE = 'systemd_services';
 
+export const UPLOAD_SERVICE_UNIT = 'nixcached-upload.service';
+
 export interface RootCommandOptions {
   ignoreStderr?: boolean;
 }

diff --git a/src/index.ts b/src/index.ts
@@ -35,6 +35,7 @@ import {
   SERVICES_STATE,
   SYSTEMD_DROPIN_STATE,
   TEMP_DIR_STATE,
+  UPLOAD_SERVICE_UNIT,
 } from './common';
 import { generate } from './config_gen';
 
@@ -194,12 +195,11 @@ const NIXCACHED_PORT = 38380;
 
       if (nixcachedPipe) {
         debug('Starting nixcached upload...');
-        const UPLOAD_SERVICE = 'nixcached-upload.service';
-        servicesStarted.push(UPLOAD_SERVICE);
+        servicesStarted.push(UPLOAD_SERVICE_UNIT);
         await runCommand([
           'systemd-run',
           '--user',
-          `--unit=${UPLOAD_SERVICE}`,
+          `--unit=${UPLOAD_SERVICE_UNIT}`,
           '--property=KillMode=mixed',
           '--property=KillSignal=SIGHUP',
           ...setenvFlags,