Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
e3923a35
Commit
e3923a35
authored
Apr 19, 2012
by
antirez
Browse files
SHUTDOWN NOSAVE now can stop a non returning script. Issue #466.
parent
1e35ae74
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
e3923a35
...
@@ -1599,7 +1599,7 @@ int processCommand(redisClient *c) {
...
@@ -1599,7 +1599,7 @@ int processCommand(redisClient *c) {
/* Lua script too slow? Only allow SHUTDOWN NOSAVE and SCRIPT KILL. */
/* Lua script too slow? Only allow SHUTDOWN NOSAVE and SCRIPT KILL. */
if
(
server
.
lua_timedout
&&
if
(
server
.
lua_timedout
&&
!
(
c
->
cmd
->
proc
!
=
shutdownCommand
&&
!
(
c
->
cmd
->
proc
=
=
shutdownCommand
&&
c
->
argc
==
2
&&
c
->
argc
==
2
&&
tolower
(((
char
*
)
c
->
argv
[
1
]
->
ptr
)[
0
])
==
'n'
)
&&
tolower
(((
char
*
)
c
->
argv
[
1
]
->
ptr
)[
0
])
==
'n'
)
&&
!
(
c
->
cmd
->
proc
==
scriptCommand
&&
!
(
c
->
cmd
->
proc
==
scriptCommand
&&
...
...
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