Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
A
Aragami
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
3rdeye
Aragami
Commits
99382700
Commit
99382700
authored
Oct 30, 2023
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lock connection stack
parent
4b8ca8c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
25 deletions
+34
-25
src/drivers/redis.ts
src/drivers/redis.ts
+34
-25
No files found.
src/drivers/redis.ts
View file @
99382700
import
{
BaseDriver
}
from
'
../base-driver
'
;
import
{
BaseDriver
}
from
'
../base-driver
'
;
import
Redis
from
'
ioredis
'
;
import
Redis
from
'
ioredis
'
;
import
Redlock
from
'
@nanahira/redlock
'
;
import
Redlock
from
'
@nanahira/redlock
'
;
import
{
RedisDriverOptions
}
from
'
../def
'
;
import
{
Awaitable
,
RedisDriverOptions
}
from
'
../def
'
;
import
{
createPool
}
from
'
generic-pool
'
;
import
{
createPool
}
from
'
generic-pool
'
;
export
class
RedisDriver
extends
BaseDriver
{
export
class
RedisDriver
extends
BaseDriver
{
...
@@ -16,6 +16,15 @@ export class RedisDriver extends BaseDriver {
...
@@ -16,6 +16,15 @@ export class RedisDriver extends BaseDriver {
return
redis
;
return
redis
;
}
}
async
useTempRedisClient
<
T
>
(
cb
:
(
redis
:
Redis
)
=>
Awaitable
<
T
>
)
{
const
redis
=
await
this
.
createRedisClient
();
try
{
return
await
cb
(
redis
);
}
finally
{
await
redis
.
quit
();
}
}
private
pool
=
createPool
({
private
pool
=
createPool
({
create
:
async
()
=>
{
create
:
async
()
=>
{
const
redis
=
await
this
.
createRedisClient
();
const
redis
=
await
this
.
createRedisClient
();
...
@@ -86,13 +95,14 @@ export class RedisDriver extends BaseDriver {
...
@@ -86,13 +95,14 @@ export class RedisDriver extends BaseDriver {
}
}
override
async
lock
<
R
>
(
keys
:
string
[],
cb
:
()
=>
Promise
<
R
>
):
Promise
<
R
>
{
override
async
lock
<
R
>
(
keys
:
string
[],
cb
:
()
=>
Promise
<
R
>
):
Promise
<
R
>
{
const
redis
=
await
this
.
createRedisClient
();
return
this
.
useTempRedisClient
(
async
(
redis
)
=>
{
const
redlock
=
new
Redlock
([
redis
],
this
.
options
.
lock
);
const
redlock
=
new
Redlock
([
redis
],
this
.
options
.
lock
);
return
redlock
.
using
(
return
redlock
.
using
(
keys
.
map
((
key
)
=>
`
${
this
.
options
.
lock
?.
prefix
||
'
_lock
'
}:
$
{
key
}
`
),
keys
.
map
((
key
)
=>
`
${
this
.
options
.
lock
?.
prefix
||
'
_lock
'
}:
$
{
key
}
`
),
this
.
options
.
lock
?.
duration
||
5000
,
this
.
options
.
lock
?.
duration
||
5000
,
cb
,
cb
,
);
);
});
}
}
override
async
isFree
(
keys
:
string
[]):
Promise
<
boolean
>
{
override
async
isFree
(
keys
:
string
[]):
Promise
<
boolean
>
{
...
@@ -154,23 +164,22 @@ export class RedisDriver extends BaseDriver {
...
@@ -154,23 +164,22 @@ export class RedisDriver extends BaseDriver {
override
async
queueGatherBlocking
(
key
:
string
):
Promise
<
Buffer
>
{
override
async
queueGatherBlocking
(
key
:
string
):
Promise
<
Buffer
>
{
if
(
this
.
quitted
)
return
;
if
(
this
.
quitted
)
return
;
const
_key
=
this
.
getQueueKey
(
key
);
const
_key
=
this
.
getQueueKey
(
key
);
const
redisClient
=
await
this
.
createRedisClient
();
return
this
.
useTempRedisClient
(
async
(
redisClient
)
=>
{
try
{
try
{
const
valueProm
=
redisClient
.
brpopBuffer
(
_key
,
0
);
const
valueProm
=
redisClient
.
brpopBuffer
(
_key
,
0
);
const
exitProm
=
new
Promise
<
void
>
((
resolve
)
=>
{
const
exitProm
=
new
Promise
<
void
>
((
resolve
)
=>
{
this
.
waitingBlockingProms
.
set
(
valueProm
,
resolve
);
this
.
waitingBlockingProms
.
set
(
valueProm
,
resolve
);
});
});
const
value
=
await
Promise
.
race
([
valueProm
,
exitProm
]);
const
value
=
await
Promise
.
race
([
valueProm
,
exitProm
]);
this
.
waitingBlockingProms
.
delete
(
valueProm
);
this
.
waitingBlockingProms
.
delete
(
valueProm
);
if
(
value
)
return
value
?.[
1
];
if
(
value
)
return
value
?.[
1
];
//console.log('wait2');
//console.log('wait2');
return
await
this
.
queueGatherBlocking
(
key
);
return
await
this
.
queueGatherBlocking
(
key
);
}
catch
(
e
)
{
}
catch
(
e
)
{
//console.log(e);
//console.log(e);
return
await
this
.
queueGatherBlocking
(
key
);
return
await
this
.
queueGatherBlocking
(
key
);
}
finally
{
}
await
redisClient
.
quit
();
});
}
}
}
async
queueClear
(
key
:
string
):
Promise
<
void
>
{
async
queueClear
(
key
:
string
):
Promise
<
void
>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment