Skip to content

Support the MAXAGE option for CLIENT KILL #2714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −5
Open

Support the MAXAGE option for CLIENT KILL #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/client/lib/commands/CLIENT_KILL.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,15 @@ describe('CLIENT KILL', () => {
['CLIENT', 'KILL', 'TYPE', 'master', 'SKIPME']
);
});

it('MAX_AGE', () => {
assert.deepEqual(
transformArguments({
filter: ClientKillFilters.MAX_AGE,
maxAge: 5
}),
['CLIENT', 'KILL', 'MAXAGE', '5']
);
});
});
});
19 changes: 14 additions & 5 deletions packages/client/lib/commands/CLIENT_KILL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export enum ClientKillFilters {
ID = 'ID',
TYPE = 'TYPE',
USER = 'USER',
SKIP_ME = 'SKIPME'
SKIP_ME = 'SKIPME',
MAX_AGE = 'MAXAGE'
}

interface KillFilter<T extends ClientKillFilters> {
Expand Down Expand Up @@ -37,7 +38,11 @@ type KillSkipMe = ClientKillFilters.SKIP_ME | (KillFilter<ClientKillFilters.SKIP
skipMe: boolean;
});

type KillFilters = KillAddress | KillLocalAddress | KillId | KillType | KillUser | KillSkipMe;
interface KillMaxAge extends KillFilter<ClientKillFilters.MAX_AGE> {
maxAge: number;
}

type KillFilters = KillAddress | KillLocalAddress | KillId | KillType | KillUser | KillSkipMe | KillMaxAge;

export function transformArguments(filters: KillFilters | Array<KillFilters>): RedisCommandArguments {
const args = ['CLIENT', 'KILL'];
Expand All @@ -61,7 +66,7 @@ function pushFilter(args: RedisCommandArguments, filter: KillFilters): void {

args.push(filter.filter);

switch(filter.filter) {
switch (filter.filter) {
case ClientKillFilters.ADDRESS:
args.push(filter.address);
break;
Expand All @@ -83,12 +88,16 @@ function pushFilter(args: RedisCommandArguments, filter: KillFilters): void {
break;

case ClientKillFilters.USER:
args.push(filter.username);
break;
args.push(filter.username);
break;

case ClientKillFilters.SKIP_ME:
args.push(filter.skipMe ? 'yes' : 'no');
break;

case ClientKillFilters.MAX_AGE:
args.push(filter.maxAge.toString());
break;
}
}

Expand Down