X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Fleast-used-worker-choice-strategy.ts;h=601b72beba7e2ece8dc70319e682067c43fe70e0;hb=b3b1857ba11fd35d0f7118ef8046c38676473a15;hp=6318affe0a306492fe7d1257d6a99e05e3938a67;hpb=c426b04af6b85ef3ec6859929eb906bcea4fcaf7;p=poolifier.git diff --git a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts index 6318affe..601b72be 100644 --- a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts @@ -1,10 +1,10 @@ -import type { IPool } from '../pool' -import type { IWorker } from '../worker' -import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' +import type { IPool } from '../pool.js' +import type { IWorker } from '../worker.js' +import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, - InternalWorkerChoiceStrategyOptions -} from './selection-strategies-types' + WorkerChoiceStrategyOptions +} from './selection-strategies-types.js' /** * Selects the least used worker. @@ -23,7 +23,7 @@ export class LeastUsedWorkerChoiceStrategy< /** @inheritDoc */ public constructor ( pool: IPool, - opts: InternalWorkerChoiceStrategyOptions + opts?: WorkerChoiceStrategyOptions ) { super(pool, opts) } @@ -54,11 +54,8 @@ export class LeastUsedWorkerChoiceStrategy< return this.pool.workerNodes.reduce( (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => { return this.isWorkerNodeReady(workerNodeKey) && - workerNode.usage.tasks.executed + - workerNode.usage.tasks.executing + - workerNode.usage.tasks.queued < - workerNodes[minWorkerNodeKey].usage.tasks.executed + - workerNodes[minWorkerNodeKey].usage.tasks.executing + + workerNode.usage.tasks.executing + workerNode.usage.tasks.queued < + workerNodes[minWorkerNodeKey].usage.tasks.executing + workerNodes[minWorkerNodeKey].usage.tasks.queued ? workerNodeKey : minWorkerNodeKey