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
ee1cef18
Commit
ee1cef18
authored
Oct 04, 2019
by
antirez
Browse files
Minor aesthetic changes to #6419.
parent
264778af
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/scripting.c
View file @
ee1cef18
...
@@ -1411,7 +1411,7 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
...
@@ -1411,7 +1411,7 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
serverLog
(
LL_WARNING
,
serverLog
(
LL_WARNING
,
"Lua slow script detected: still in execution after %lld milliseconds. "
"Lua slow script detected: still in execution after %lld milliseconds. "
"You can try killing the script using the SCRIPT KILL command. "
"You can try killing the script using the SCRIPT KILL command. "
"
s
cript SHA is: %s"
,
"
S
cript SHA
1
is: %s"
,
elapsed
,
server
.
lua_cur_script
);
elapsed
,
server
.
lua_cur_script
);
server
.
lua_timedout
=
1
;
server
.
lua_timedout
=
1
;
/* Once the script timeouts we reenter the event loop to permit others
/* Once the script timeouts we reenter the event loop to permit others
...
...
src/server.h
View file @
ee1cef18
...
@@ -1389,7 +1389,7 @@ struct redisServer {
...
@@ -1389,7 +1389,7 @@ struct redisServer {
lua_State
*
lua
;
/* The Lua interpreter. We use just one for all clients */
lua_State
*
lua
;
/* The Lua interpreter. We use just one for all clients */
client
*
lua_client
;
/* The "fake client" to query Redis from Lua */
client
*
lua_client
;
/* The "fake client" to query Redis from Lua */
client
*
lua_caller
;
/* The client running EVAL right now, or NULL */
client
*
lua_caller
;
/* The client running EVAL right now, or NULL */
char
*
lua_cur_script
;
/*
The current script right now
, or NULL */
char
*
lua_cur_script
;
/*
SHA1 of the script currently running
, or NULL */
dict
*
lua_scripts
;
/* A dictionary of SHA1 -> Lua scripts */
dict
*
lua_scripts
;
/* A dictionary of SHA1 -> Lua scripts */
unsigned
long
long
lua_scripts_mem
;
/* Cached scripts' memory + oh */
unsigned
long
long
lua_scripts_mem
;
/* Cached scripts' memory + oh */
mstime_t
lua_time_limit
;
/* Script timeout in milliseconds */
mstime_t
lua_time_limit
;
/* Script timeout in milliseconds */
...
...
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