Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove workaround for cli parameters being turned into string

Browse Source
This commit is contained in:
Thomas Dupont 2022-06-01 10:43:37 +02:00 committed by Joachim Van Herwegen
parent 3f817b14b0
commit a99db00fb2
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/init/cluster/ClusterManager.ts
View File

@ -49,12 +49,8 @@ export class ClusterManager {
private readonly workers: number; private readonly workers: number;
private readonly clusterMode: ClusterMode; private readonly clusterMode: ClusterMode;
public constructor(workers: number | string) { public constructor(workers: number) {
const cores = cpus().length; const cores = cpus().length;
// Workaround for https://github.com/CommunitySolidServer/CommunitySolidServer/issues/1182
if (typeof workers === 'string') {
workers = Number.parseInt(workers, 10);
}
if (workers <= -cores) { if (workers <= -cores) {
throw new InternalServerError('Invalid workers value (should be in the interval ]-num_cores, +∞).'); throw new InternalServerError('Invalid workers value (should be in the interval ]-num_cores, +∞).');

18
test/unit/init/cluster/ClusterManager.test.ts
View File

@ -30,7 +30,7 @@ describe('A ClusterManager', (): void => {
}); });
it('can handle workers input as string.', (): void => { it('can handle workers input as string.', (): void => {
const cm = new ClusterManager('4'); const cm = new ClusterManager(4);
expect(cm.isSingleThreaded()).toBeFalsy(); expect(cm.isSingleThreaded()).toBeFalsy();
}); });
@ -46,14 +46,14 @@ describe('A ClusterManager', (): void => {
}); });
it('errors on invalid workers amount.', (): void => { it('errors on invalid workers amount.', (): void => {
expect((): ClusterManager => new ClusterManager('10')).toBeDefined(); expect((): ClusterManager => new ClusterManager(10)).toBeDefined();
expect((): ClusterManager => new ClusterManager('2')).toBeDefined(); expect((): ClusterManager => new ClusterManager(2)).toBeDefined();
expect((): ClusterManager => new ClusterManager('1')).toBeDefined(); expect((): ClusterManager => new ClusterManager(1)).toBeDefined();
expect((): ClusterManager => new ClusterManager('0')).toBeDefined(); expect((): ClusterManager => new ClusterManager(0)).toBeDefined();
expect((): ClusterManager => new ClusterManager('-1')).toBeDefined(); expect((): ClusterManager => new ClusterManager(-1)).toBeDefined();
expect((): ClusterManager => new ClusterManager('-5')).toBeDefined(); expect((): ClusterManager => new ClusterManager(-5)).toBeDefined();
expect((): ClusterManager => new ClusterManager('-6')).toThrow('Invalid workers value'); expect((): ClusterManager => new ClusterManager(-6)).toThrow('Invalid workers value');
expect((): ClusterManager => new ClusterManager('-10')).toThrow('Invalid workers value'); expect((): ClusterManager => new ClusterManager(-10)).toThrow('Invalid workers value');
}); });
it('has an isPrimary() that works.', (): void => { it('has an isPrimary() that works.', (): void => {