@nxtedition/lib 27.0.2 → 27.0.3

package/app.js

@@ -363,60 +363,6 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     }
   }
 
-  let affinity = null
-
-  if (process.platform === 'linux' && appConfig.numa != null && appConfig.numa !== '') {
-    let numa = appConfig.numa
-    if (numa == 'auto' || numa === true) {
-      numa = hashString(JSON.stringify({ serviceName, serviceModule }))
-    }
-
-    if (numa === 'net') {
-      if (config.hostname) {
-        ds.record
-          .observe(`${config.hostname}:monitor.stats?`, ds.record.PROVIDER)
-          .pipe(
-            rxjs.map((stats) => stats?.net?.bonding?.[0]?.numaNode ?? null),
-            rxjs.filter((n) => Number.isInteger(n) && n >= 0),
-            rxjs.timeout({
-              first: 10e3,
-              with: () => rxjs.of(null),
-            }),
-            rxjs.distinctUntilChanged(),
-            rxjs.retry({
-              resetOnSuccess: true,
-              delay(err, retryCount) {
-                logger.error({ err, retryCount }, 'net numa failed')
-                return rxjs.timer(10e3)
-              },
-            }),
-          )
-          .subscribe((numaNode) => {
-            if (numaNode != null) {
-              try {
-                affinity = numa.setAffinity(numaNode)
-                logger.debug(
-                  { hostname: config.hostname, numaNode, affinity },
-                  'net numa succeeded',
-                )
-              } catch (err) {
-                logger.error({ err, hostname: config.hostname, numaNode }, 'net numa failed')
-              }
-            } else {
-              logger.warn({ hostname: config.hostname, numaNode }, 'net numa missing')
-            }
-          })
-      }
-    } else {
-      try {
-        affinity = setAffinity(numa)
-        logger.debug({ data: { numa: appConfig.numa, affinity } }, 'set numa affinity succeeded')
-      } catch (err) {
-        logger.error({ err, data: { numa: appConfig.numa } }, 'set numa affinity failed')
-      }
-    }
-  }
-
   if (appConfig.toobusy) {
     const resolution = appConfig.toobusy.resolution ?? 10
     const interval = appConfig.toobusy.interval ?? 500
@@ -614,6 +560,63 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     appDestroyers.unshift(() => ds.close())
   }
 
+  if (process.platform === 'linux' && appConfig.numa != null && appConfig.numa !== '') {
+    let numa = appConfig.numa
+    if (numa == 'auto' || numa === true) {
+      numa = hashString(
+        JSON.stringify({ serviceName, serviceModule, serviceInstanceId, serviceWorkerId }),
+      )
+    }
+
+    if (numa === 'net') {
+      if (config.hostname) {
+        if (!ds) {
+          throw new Error('deepstream is required for net numa')
+        }
+        ds.record
+          .observe(`${config.hostname}:monitor.stats?`, ds.record.PROVIDER)
+          .pipe(
+            rxjs.map((stats) => stats?.net?.bonding?.[0]?.numaNode ?? null),
+            rxjs.filter((n) => Number.isInteger(n) && n >= 0),
+            rxjs.timeout({
+              first: 10e3,
+              with: () => rxjs.of(null),
+            }),
+            rxjs.distinctUntilChanged(),
+            rxjs.retry({
+              resetOnSuccess: true,
+              delay(err, retryCount) {
+                logger.error({ err, retryCount }, 'net numa failed')
+                return rxjs.timer(10e3)
+              },
+            }),
+          )
+          .subscribe((numaNode) => {
+            if (numaNode != null) {
+              try {
+                const affinity = numa.setAffinity(numaNode)
+                logger.debug(
+                  { hostname: config.hostname, numaNode, affinity },
+                  'net numa succeeded',
+                )
+              } catch (err) {
+                logger.error({ err, hostname: config.hostname, numaNode }, 'net numa failed')
+              }
+            } else {
+              logger.warn({ hostname: config.hostname, numaNode }, 'net numa missing')
+            }
+          })
+      }
+    } else {
+      try {
+        const affinity = setAffinity(numa)
+        logger.debug({ data: { numa: appConfig.numa, affinity } }, 'set numa affinity succeeded')
+      } catch (err) {
+        logger.error({ err, data: { numa: appConfig.numa } }, 'set numa affinity failed')
+      }
+    }
+  }
+
   if (appConfig.compiler) {
     compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
@@ -1327,6 +1330,5 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     serviceInstanceId,
     serviceWorkerId,
     signal: ac.signal,
-    affinity,
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.2",
+  "version": "27.0.3",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -87,5 +87,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "ad258cea82e41d8d196fc344fd7436675abf70a0"
+  "gitHead": "383b7fe1d10a8b7d80aa80ea81e7828f415d248d"
 }