@nxtedition/lib 26.0.31 → 26.0.33

package/app.js

@@ -317,11 +317,9 @@ export function makeApp(appConfig, onTerminate) {
   }
 
   let affinity = null
-  if (
-    process.platform === 'linux' &&
-    (isMainThread || appConfig.affinity != null) &&
-    appConfig.affinity !== false
-  ) {
+
+  const numa = appConfig.numa ?? config.numa
+  if (process.platform === 'linux' && (isMainThread || numa != null) && numa !== false) {
     const allNodes = []
     for (const entry of fs.readdirSync('/sys/devices/system/node')) {
       if (!entry.startsWith('node')) {
@@ -346,12 +344,18 @@ export function makeApp(appConfig, onTerminate) {
     }
 
     let indices = []
-    if (Number.isInteger(appConfig.affinity)) {
-      indices = [appConfig.affinity % allNodes.length]
-    } else if (appConfig.affinity == null) {
+    if (Number.isInteger(numa)) {
+      indices = [numa % allNodes.length]
+    } else if (
+      numa == null ||
+      numa === true ||
+      numa === 'auto' ||
+      numa === 'hash' ||
+      numa === 'default'
+    ) {
       indices = [hashString(serviceName) % allNodes.length]
     } else {
-      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+      throw new Error('invalid numa configuration: ' + numa)
     }
 
     affinity = indices.flatMap((i) => allNodes[i] ?? [])
@@ -363,15 +367,12 @@ export function makeApp(appConfig, onTerminate) {
       affinity.length === 0 ||
       affinity.some((x) => !Number.isInteger(x) || x < 0)
     ) {
-      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+      throw new Error('invalid numa configuration: ' + numa)
     }
 
     try {
       sched_setaffinity(0, affinity)
-      logger.debug(
-        { data: { value: appConfig.affinity, affinity, indices } },
-        'sched_setaffinity succeeded',
-      )
+      logger.debug({ data: { numa, affinity, indices } }, 'sched_setaffinity succeeded')
     } catch (err) {
       logger.error({ err }, 'sched_setaffinity failed')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.31",
+  "version": "26.0.33",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",