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
a83e3663
Commit
a83e3663
authored
Feb 28, 2022
by
Oran Agra
Browse files
Merge remote-tracking branch 'origin/unstable' into 7.0
parents
d5915a16
5860fa3d
Changes
142
Hide whitespace changes
Inline
Side-by-side
utils/create-cluster/create-cluster
View file @
a83e3663
...
...
@@ -28,7 +28,7 @@ then
while
[
$((
PORT < ENDPORT
))
!=
"0"
]
;
do
PORT
=
$((
PORT+1
))
echo
"Starting
$PORT
"
$BIN_PATH
/redis-server
--port
$PORT
--protected-mode
$PROTECTED_MODE
--cluster-enabled
yes
--cluster-config-file
nodes-
${
PORT
}
.conf
--cluster-node-timeout
$TIMEOUT
--appendonly
yes
--appendfilename
appendonly-
${
PORT
}
.aof
--dbfilename
dump-
${
PORT
}
.rdb
--logfile
${
PORT
}
.log
--daemonize
yes
${
ADDITIONAL_OPTIONS
}
$BIN_PATH
/redis-server
--port
$PORT
--protected-mode
$PROTECTED_MODE
--cluster-enabled
yes
--cluster-config-file
nodes-
${
PORT
}
.conf
--cluster-node-timeout
$TIMEOUT
--appendonly
yes
--appendfilename
appendonly-
${
PORT
}
.aof
--appenddirname
appendonlydir-
${
PORT
}
--dbfilename
dump-
${
PORT
}
.rdb
--logfile
${
PORT
}
.log
--daemonize
yes
${
ADDITIONAL_OPTIONS
}
done
exit
0
fi
...
...
@@ -95,20 +95,25 @@ fi
if
[
"
$1
"
==
"clean"
]
then
echo
"Cleaning *.log"
rm
-rf
*
.log
rm
-rf
appendonly
*
.aof
rm
-rf
dump
*
.rdb
rm
-rf
nodes
*
.conf
echo
"Cleaning appendonlydir-*"
rm
-rf
appendonlydir-
*
echo
"Cleaning dump-*.rdb"
rm
-rf
dump-
*
.rdb
echo
"Cleaning nodes-*.conf"
rm
-rf
nodes-
*
.conf
exit
0
fi
if
[
"
$1
"
==
"clean-logs"
]
then
echo
"Cleaning *.log"
rm
-rf
*
.log
exit
0
fi
echo
"Usage:
$0
[start|create|stop|watch|tail|
clean
|call]"
echo
"Usage:
$0
[start|create|stop|watch|tail|
tailall|clean|clean-logs
|call]"
echo
"start -- Launch Redis Cluster instances."
echo
"create [-f] -- Create a cluster using redis-cli --cluster create."
echo
"stop -- Stop Redis Cluster instances."
...
...
src/
module
s/gen
doc.rb
→
utils/generate-
module
-api-
doc.rb
100644 → 100755
View file @
a83e3663
#!/usr/bin/env ruby
# coding: utf-8
# gendoc.rb -- Converts the top-comments inside module.c to modules API
# reference documentation in markdown format.
...
...
@@ -78,6 +80,7 @@ def docufy(src,i)
puts
"<span id=
\"
#{
name
}
\"
></span>
\n\n
"
puts
"### `
#{
name
}
`
\n\n
"
puts
"
#{
proto
}
\n
"
puts
"**Available since:**
#{
$since
[
name
]
}
\n\n
"
if
$since
[
name
]
comment
=
""
while
true
i
=
i
-
1
...
...
@@ -135,8 +138,9 @@ def is_func_line(src, i)
end
puts
"# Modules API reference
\n\n
"
puts
"<!-- This file is generated from module.c using gendoc.rb -->
\n\n
"
src
=
File
.
open
(
File
.
dirname
(
__FILE__
)
++
"/../module.c"
).
to_a
puts
"<!-- This file is generated from module.c using
\n
"
puts
" utils/generate-module-api-doc.rb -->
\n\n
"
src
=
File
.
open
(
File
.
dirname
(
__FILE__
)
++
"/../src/module.c"
).
to_a
# Build function index
$index
=
{}
...
...
@@ -148,6 +152,24 @@ src.each_with_index do |line,i|
end
end
# Populate the 'since' map (name => version) if we're in a git repo.
$since
=
{}
git_dir
=
File
.
dirname
(
__FILE__
)
++
"/../.git"
if
File
.
directory?
(
git_dir
)
&&
`which git`
!=
""
`git --git-dir="
#{
git_dir
}
" tag --sort=v:refname`
.
each_line
do
|
version
|
next
if
version
!~
/^(\d+)\.\d+\.\d+?$/
||
$1
.
to_i
<
4
version
.
chomp!
`git --git-dir="
#{
git_dir
}
" cat-file blob "
#{
version
}
:src/module.c"`
.
each_line
do
|
line
|
if
line
=~
/^\w.*[ \*]RM_([A-z0-9]+)/
name
=
"RedisModule_
#{
$1
}
"
if
!
$since
[
name
]
$since
[
name
]
=
version
end
end
end
end
end
# Print TOC
puts
"## Sections
\n\n
"
src
.
each_with_index
do
|
_line
,
i
|
...
...
Prev
1
…
4
5
6
7
8
Next
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