nchan_tools 0.1.5 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/exe/nchan-benchmark +6 -2
- data/exe/nchan-pub +1 -1
- data/exe/nchan-redis-debug +63 -0
- data/exe/nchan-sub +3 -3
- data/lib/nchan_tools/benchmark.rb +65 -38
- data/lib/nchan_tools/pubsub.rb +32 -17
- data/lib/nchan_tools/rdsck.rb +111 -0
- data/lib/nchan_tools/version.rb +1 -1
- data/nchan_tools.gemspec +3 -3
- metadata +9 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 07a8230e83733a4948ee9cc9df50eea8b698f2762e7f70a054f9708c98bb7ea1
|
4
|
+
data.tar.gz: 16ab41364f02c7996441a8f461bd969d9c11af023936e64f0be1f912f81ece88
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f2f505b79a22588f37f38f12aa0c461cf5d9db9f3c89375f6a70a9a0df3b8a62f2b778425fbb71bc4b7eb9b8b4fdf275c08cf365dd9d89b57e5396ed5312e1e
|
7
|
+
data.tar.gz: 6c4bfe8a215370d37319144375b633bbbb868d1f50ac4dc1f6c2736dce057f78edd30e3995d7be34a5534d80f0ee4cd50f5d0633b63da085c28620c24751a979
|
data/exe/nchan-benchmark
CHANGED
@@ -9,7 +9,7 @@ require "HDRHistogram"
|
|
9
9
|
|
10
10
|
verbose = false
|
11
11
|
save_csv = false
|
12
|
-
|
12
|
+
csv_columns = NchanTools::Benchmark::CSV_COLUMNS_DEFAULT
|
13
13
|
init_args = {}
|
14
14
|
|
15
15
|
opt_parser=OptionParser.new do |opts|
|
@@ -19,6 +19,9 @@ opt_parser=OptionParser.new do |opts|
|
|
19
19
|
opts.on("--csv FILENAME", "Append results to file in CSV format") do |f|
|
20
20
|
save_csv = f
|
21
21
|
end
|
22
|
+
opts.on("--csv-columns col1,col2,...", "csv columns list") do |f|
|
23
|
+
csv_columns = f.split(/\W+/).map(&:to_sym)
|
24
|
+
end
|
22
25
|
opts.on("-t", "--time TIME", "Time to run benchmark") do |v|
|
23
26
|
init_args[:time] = v
|
24
27
|
end
|
@@ -43,6 +46,7 @@ urls += ARGV
|
|
43
46
|
begin
|
44
47
|
urls += STDIN.read_nonblock(100000).split /\s*\n+\s*/
|
45
48
|
rescue IO::WaitReadable
|
49
|
+
rescue EOFError
|
46
50
|
end
|
47
51
|
|
48
52
|
urls.uniq!
|
@@ -50,5 +54,5 @@ urls.uniq!
|
|
50
54
|
benchan = NchanTools::Benchmark.new urls, init_args
|
51
55
|
benchan.run
|
52
56
|
benchan.results
|
53
|
-
benchan.append_csv_file(save_csv) if save_csv
|
57
|
+
benchan.append_csv_file(save_csv, csv_columns) if save_csv
|
54
58
|
|
data/exe/nchan-pub
CHANGED
@@ -54,7 +54,7 @@ puts "Publishing to #{url}."
|
|
54
54
|
|
55
55
|
loopmsg=("\r"*20) + "sending message #"
|
56
56
|
|
57
|
-
pub = Publisher.new url, nostore: true, timeout: timeout, verbose: verbose, websocket: websocket
|
57
|
+
pub = NchanTools::Publisher.new url, nostore: true, timeout: timeout, verbose: verbose, websocket: websocket
|
58
58
|
pub.accept=accept
|
59
59
|
pub.nofail=true
|
60
60
|
repeat=true
|
@@ -0,0 +1,63 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
|
3
|
+
require "redis"
|
4
|
+
require "optparse"
|
5
|
+
require 'nchan_tools/rdsck'
|
6
|
+
|
7
|
+
$opt = {
|
8
|
+
url: "redis://127.0.0.1:6379/",
|
9
|
+
verbose: false,
|
10
|
+
command: nil
|
11
|
+
}
|
12
|
+
|
13
|
+
def dbg(...)
|
14
|
+
if $opt[:verbose]
|
15
|
+
print("# ")
|
16
|
+
puts(...)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
opt_parser=OptionParser.new do |opts|
|
21
|
+
opts.on("--url", "--url REDIS_URL (#{$opt[:url]})", "Redis server and port..") do |v|
|
22
|
+
$opt[:url]=v
|
23
|
+
end
|
24
|
+
opts.on("-q", "--quiet", "output only results without any other information") do
|
25
|
+
$opt[:quiet]=false
|
26
|
+
end
|
27
|
+
opts.on("--list-channels", "list all Nchan channels on Redis server or cluster") do |v|
|
28
|
+
$opt[:command]=:filter_channels
|
29
|
+
end
|
30
|
+
opts.on("--filter-channels-min-subscribers=[NUMBER]") do |v|
|
31
|
+
$opt[:command]=:filter_channels
|
32
|
+
$opt[:min_subscribers]=v.to_i
|
33
|
+
end
|
34
|
+
end
|
35
|
+
opt_parser.banner= <<~EOB
|
36
|
+
Debugging tools for the Redis server or cluster backing Nchan.
|
37
|
+
Usage: nchan-redis-debug [options]
|
38
|
+
|
39
|
+
WARNING: --list-channels and --filter-channels-* options for this tool
|
40
|
+
use the Redis SCAN command. This may increase CPU load on the Redis
|
41
|
+
server and may affect the latency of Nchan requests.
|
42
|
+
USE THESE OPTIONS WITH GREAT CARE
|
43
|
+
|
44
|
+
Example:
|
45
|
+
nchan-redis-debug --url redis:// --filter-channels-min-subscribers=10
|
46
|
+
EOB
|
47
|
+
opt_parser.parse!
|
48
|
+
|
49
|
+
rdsck = Rdsck.new $opt
|
50
|
+
if not rdsck.connect
|
51
|
+
STDERR.puts "failed to connect to #{$opt[:url]}"
|
52
|
+
exit 1
|
53
|
+
end
|
54
|
+
|
55
|
+
case $opt[:command]
|
56
|
+
when :filter_channels
|
57
|
+
puts "# scanning for channels #{$opt[:min_subscribers] && "with subscribers >= #{$opt[:min_subscribers]}"}"
|
58
|
+
chans = rdsck.filter_channels(min_subscribers: $opt[:min_subscribers])
|
59
|
+
puts "# found #{chans.count} channel#{chans.count != 1 && "s"}#{chans.count == 0 ? "." : ":"}"
|
60
|
+
puts chans.join("\n")
|
61
|
+
else
|
62
|
+
puts "Nothing to do"
|
63
|
+
end
|
data/exe/nchan-sub
CHANGED
@@ -33,7 +33,7 @@ opt_parser=OptionParser.new do |opts|
|
|
33
33
|
opts.on("-p", "--parallel NUM (#{par})", "number of parallel clients"){|v| par = v.to_i}
|
34
34
|
opts.on("-t", "--timeout SEC (#{opt[:timeout]})", "Long-poll timeout"){|v| opt[:timeout] = v}
|
35
35
|
opts.on("-q", "--quit STRING (#{opt[:quit_message]})", "Quit message"){|v| opt[:quit_message] = v}
|
36
|
-
opts.on("-c", "--client STRING (#{opt[:client]})", "sub client (one of #{Subscriber::Client.unique_aliases.join ', '})") do |v|
|
36
|
+
opts.on("-c", "--client STRING (#{opt[:client]})", "sub client (one of #{NchanTools::Subscriber::Client.unique_aliases.join ', '})") do |v|
|
37
37
|
opt[:client] = v.to_sym
|
38
38
|
end
|
39
39
|
opts.on("--content-type", "show received content-type"){|v| print_content_type = true}
|
@@ -68,7 +68,7 @@ if origin
|
|
68
68
|
opt[:extra_headers]['Origin'] = origin
|
69
69
|
end
|
70
70
|
|
71
|
-
sub = Subscriber.new url, par, opt
|
71
|
+
sub = NchanTools::Subscriber.new url, par, opt
|
72
72
|
|
73
73
|
|
74
74
|
NOMSGF="\r"*30 + "Received message %i, len:%i"
|
@@ -111,7 +111,7 @@ sub.on_message do |msg|
|
|
111
111
|
end
|
112
112
|
|
113
113
|
sub.on_failure do |err_msg|
|
114
|
-
if Subscriber::IntervalPollClient === sub.client
|
114
|
+
if NchanTools::Subscriber::IntervalPollClient === sub.client
|
115
115
|
unless err_msg.match(/\(code 304\)/)
|
116
116
|
false
|
117
117
|
end
|
@@ -5,6 +5,8 @@ require 'json'
|
|
5
5
|
|
6
6
|
module NchanTools
|
7
7
|
class Benchmark
|
8
|
+
CSV_COLUMNS_ALL=%i[servers runtime channels channels_K channels_M subscribers message_length messages_sent messages_send_confirmed messages_send_unconfirmed messages_send_failed messages_received messages_unreceived messages_send_rate messages_receive_rate messages_send_rate_per_channel messages_receive_rate_per_subscriber message_publishing_avg message_publishing_99th message_publishing_max message_publishing_stddev message_publishing_count message_delivery_avg message_delivery_99th message_delivery_max message_delivery_stddev message_delivery_count]
|
9
|
+
CSV_COLUMNS_DEFAULT=%i[servers runtime channels subscribers message_length messages_sent messages_send_confirmed messages_send_unconfirmed messages_send_failed messages_received messages_unreceived messages_send_rate messages_receive_rate messages_send_rate_per_channel messages_receive_rate_per_subscriber message_publishing_avg message_publishing_99th message_publishing_max message_publishing_stddev message_publishing_count message_delivery_avg message_delivery_99th message_delivery_max message_delivery_stddev message_delivery_count]
|
8
10
|
class BenchmarkError < StandardError
|
9
11
|
end
|
10
12
|
def initialize(urls, init_args=nil)
|
@@ -19,9 +21,7 @@ class Benchmark
|
|
19
21
|
@failed = {}
|
20
22
|
|
21
23
|
@init_args = init_args
|
22
|
-
|
23
|
-
@hdrh_publish = nil
|
24
|
-
@hdrh_receive = nil
|
24
|
+
@histograms = {}
|
25
25
|
|
26
26
|
subs = []
|
27
27
|
end
|
@@ -46,17 +46,27 @@ class Benchmark
|
|
46
46
|
puts " #{sub.url} ok"
|
47
47
|
@ready +=1
|
48
48
|
if @ready == @n
|
49
|
-
control :run
|
50
49
|
puts "start benchmark..."
|
50
|
+
control :run
|
51
51
|
end
|
52
52
|
when /^RUNNING/
|
53
53
|
puts " #{sub.url} running"
|
54
54
|
when /^RESULTS\n/
|
55
55
|
msg = msg[8..-1]
|
56
56
|
parsed = JSON.parse msg
|
57
|
+
|
58
|
+
#backwards-compatible histogram fields
|
59
|
+
parsed["histograms"]||={}
|
60
|
+
if parsed[:message_publishing_histogram] then
|
61
|
+
parsed[:histograms]["message publishing"]=parsed[:message_publishing_histogram]
|
62
|
+
end
|
63
|
+
if parsed[:message_delivery_histogram] then
|
64
|
+
parsed[:histograms]["message delivery"]=parsed[:message_delivery_histogram]
|
65
|
+
end
|
66
|
+
|
57
67
|
@results[sub.url] = parsed
|
58
68
|
@results[sub.url]["raw"] = msg if @results[sub.url]
|
59
|
-
|
69
|
+
sub.client.send_close
|
60
70
|
when /^INITIALIZING/
|
61
71
|
#do nothing
|
62
72
|
else
|
@@ -124,8 +134,7 @@ class Benchmark
|
|
124
134
|
@messages_send_failed = 0
|
125
135
|
@messages_received = 0
|
126
136
|
@messages_unreceived = 0
|
127
|
-
@
|
128
|
-
@hdrh_receive = nil
|
137
|
+
@histograms = {}
|
129
138
|
@results.each do |url, data|
|
130
139
|
@channels += data["channels"]
|
131
140
|
@runtime << data["run_time_sec"]
|
@@ -137,27 +146,21 @@ class Benchmark
|
|
137
146
|
@messages_send_failed += data["messages"]["send_failed"]
|
138
147
|
@messages_received += data["messages"]["received"]
|
139
148
|
@messages_unreceived += data["messages"]["unreceived"]
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
@
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
if data["message_delivery_histogram"]
|
150
|
-
hdrh = HDRHistogram.unserialize(data["message_delivery_histogram"], unit: :ms, multiplier: 0.001)
|
151
|
-
if @hdrh_receive
|
152
|
-
@hdrh_receive.merge! hdrh
|
153
|
-
else
|
154
|
-
@hdrh_receive = hdrh
|
149
|
+
if data["histograms"]
|
150
|
+
data["histograms"].each do |name, str|
|
151
|
+
name = name.to_sym
|
152
|
+
hdrh = HDRHistogram.unserialize(str, unit: :ms, multiplier: 0.001)
|
153
|
+
if @histograms[name]
|
154
|
+
@histograms[name].merge! hdrh
|
155
|
+
else
|
156
|
+
@histograms[name] = hdrh
|
157
|
+
end
|
155
158
|
end
|
156
159
|
end
|
157
160
|
end
|
158
161
|
|
159
|
-
@message_length = @message_length.
|
160
|
-
@runtime = @runtime.
|
162
|
+
@message_length = @message_length.inject(0, :+).to_f / @message_length.size
|
163
|
+
@runtime = @runtime.inject(0, :+).to_f / @runtime.size
|
161
164
|
|
162
165
|
fmt = <<-END.gsub(/^ {6}/, '')
|
163
166
|
Nchan servers: %d
|
@@ -187,26 +190,50 @@ class Benchmark
|
|
187
190
|
(@messages_sent.to_f* 60)/(@runtime * @channels),
|
188
191
|
(@messages_received.to_f * 60)/(@runtime * @subscribers)
|
189
192
|
]
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
+
@histograms.each do |name, histogram|
|
194
|
+
out << hdrhistogram_stats("#{name} latency:", histogram)
|
195
|
+
end
|
193
196
|
|
194
197
|
puts out
|
195
198
|
end
|
196
199
|
|
197
|
-
def append_csv_file(file)
|
200
|
+
def append_csv_file(file, columns=Benchmark::CSV_COLUMNS_DEFAULT)
|
198
201
|
require "csv"
|
199
|
-
write_headers = File.zero?(file)
|
200
|
-
headers =
|
202
|
+
write_headers = File.zero?(file) || !File.exists?(file)
|
203
|
+
headers = columns
|
204
|
+
vals = {
|
205
|
+
servers: @n,
|
206
|
+
runtime: @runtime,
|
207
|
+
channels: @channels,
|
208
|
+
channels_K: @channels/1000.0,
|
209
|
+
channels_M: @channels/1000000.0,
|
210
|
+
subscribers: @subscribers * @channels,
|
211
|
+
message_length: @message_length,
|
212
|
+
messages_sent: @messages_sent,
|
213
|
+
messages_send_confirmed: @messages_send_confirmed,
|
214
|
+
messages_send_unconfirmed: @messages_send_unconfirmed,
|
215
|
+
messages_send_failed: @messages_send_failed,
|
216
|
+
messages_received: @messages_received,
|
217
|
+
messages_unreceived: @messages_unreceived,
|
218
|
+
messages_send_rate: @messages_sent.to_f/@runtime,
|
219
|
+
messages_receive_rate: @messages_received.to_f/@runtime,
|
220
|
+
messages_send_rate_per_channel: (@messages_sent.to_f* 60)/(@runtime * @channels),
|
221
|
+
messages_receive_rate_per_subscriber: (@messages_received.to_f * 60)/(@runtime * @subscribers * @channels)
|
222
|
+
}
|
223
|
+
@histograms.each do |name, histogram|
|
224
|
+
vals["#{name}_avg".to_sym]=histogram.mean
|
225
|
+
vals["#{name}_95th".to_sym]=histogram.percentile(95.0)
|
226
|
+
vals["#{name}_99th".to_sym]=histogram.percentile(99.0)
|
227
|
+
vals["#{name}_max".to_sym]=histogram.max
|
228
|
+
vals["#{name}_stddev".to_sym]=histogram.stddev
|
229
|
+
vals["#{name}_count".to_sym]=histogram.count
|
230
|
+
end
|
231
|
+
|
232
|
+
row = []
|
233
|
+
headers.each { |header| row << (vals[header.to_sym] || "-")}
|
234
|
+
|
201
235
|
csv = CSV.open(file, "a", {headers: headers, write_headers: write_headers})
|
202
|
-
csv <<
|
203
|
-
@message_length, @messages_sent, @messages_send_confirmed, @messages_send_unconfirmed, @messages_send_failed,
|
204
|
-
@messages_received, @messages_unreceived,
|
205
|
-
@messages_sent.to_f/@runtime, @messages_received.to_f/@runtime,
|
206
|
-
(@messages_sent.to_f* 60)/(@runtime * @channels), (@messages_received.to_f * 60)/(@runtime * @subscribers),
|
207
|
-
@hdrh_publish.mean, @hdrh_publish.percentile(99.0), @hdrh_publish.max, @hdrh_publish.stddev, @hdrh_publish.count,
|
208
|
-
@hdrh_receive.mean, @hdrh_receive.percentile(99.0), @hdrh_receive.max, @hdrh_receive.stddev, @hdrh_receive.count
|
209
|
-
]
|
236
|
+
csv << row
|
210
237
|
csv.flush
|
211
238
|
csv.close
|
212
239
|
end
|
data/lib/nchan_tools/pubsub.rb
CHANGED
@@ -487,6 +487,14 @@ class Subscriber
|
|
487
487
|
@ws.binary data
|
488
488
|
end
|
489
489
|
|
490
|
+
def send_ping(msg=nil)
|
491
|
+
@ws.ping(msg)
|
492
|
+
end
|
493
|
+
|
494
|
+
def send_close(reason=nil, code=1000)
|
495
|
+
@ws.close(reason, code)
|
496
|
+
end
|
497
|
+
|
490
498
|
def write(data)
|
491
499
|
@sock.write data
|
492
500
|
end
|
@@ -579,11 +587,11 @@ class Subscriber
|
|
579
587
|
end
|
580
588
|
|
581
589
|
bundle.ws.on :ping do |ev|
|
582
|
-
@
|
590
|
+
@subscriber.on(:ping).call ev, bundle
|
583
591
|
end
|
584
592
|
|
585
593
|
bundle.ws.on :pong do |ev|
|
586
|
-
@
|
594
|
+
@subscriber.on(:pong).call ev, bundle
|
587
595
|
end
|
588
596
|
|
589
597
|
bundle.ws.on :error do |ev|
|
@@ -645,13 +653,6 @@ class Subscriber
|
|
645
653
|
end
|
646
654
|
end
|
647
655
|
|
648
|
-
def on_ping
|
649
|
-
@on_ping = Proc.new if block_given?
|
650
|
-
end
|
651
|
-
def on_pong
|
652
|
-
@on_pong = Proc.new if block_given?
|
653
|
-
end
|
654
|
-
|
655
656
|
def listen(bundle)
|
656
657
|
while @ws[bundle]
|
657
658
|
begin
|
@@ -681,10 +682,10 @@ class Subscriber
|
|
681
682
|
private :ws_client
|
682
683
|
|
683
684
|
def send_ping(data=nil)
|
684
|
-
ws_client.
|
685
|
+
ws_client.send_ping data
|
685
686
|
end
|
686
|
-
def send_close(
|
687
|
-
ws_client.send_close
|
687
|
+
def send_close(reason=nil, code=1000)
|
688
|
+
ws_client.send_close reason, code
|
688
689
|
end
|
689
690
|
def send_data(data)
|
690
691
|
ws_client.send_data data
|
@@ -694,17 +695,18 @@ class Subscriber
|
|
694
695
|
end
|
695
696
|
|
696
697
|
def close(bundle)
|
697
|
-
if bundle
|
698
|
+
if bundle then
|
698
699
|
@ws.delete bundle
|
699
700
|
bundle.sock.close unless bundle.sock.closed?
|
700
701
|
end
|
701
702
|
@connected -= 1
|
702
|
-
if @connected <= 0
|
703
|
-
|
703
|
+
if @connected <= 0 then
|
704
|
+
until @ws.count == 0 do
|
705
|
+
sleep 0.1
|
706
|
+
end
|
704
707
|
@cooked.signal true
|
705
708
|
end
|
706
709
|
end
|
707
|
-
|
708
710
|
end
|
709
711
|
|
710
712
|
class LongPollClient < Client
|
@@ -1518,6 +1520,8 @@ class Subscriber
|
|
1518
1520
|
|
1519
1521
|
attr_accessor :url, :client, :messages, :max_round_trips, :quit_message, :errors, :concurrency, :waiting, :finished, :client_class, :log
|
1520
1522
|
def initialize(url, concurrency=1, opt={})
|
1523
|
+
@empty_block = Proc.new {}
|
1524
|
+
@on={}
|
1521
1525
|
@care_about_message_ids=opt[:use_message_id].nil? ? true : opt[:use_message_id]
|
1522
1526
|
@url=url
|
1523
1527
|
@quit_message = opt[:quit_message]
|
@@ -1612,6 +1616,14 @@ class Subscriber
|
|
1612
1616
|
@client.poke until_what, timeout
|
1613
1617
|
end
|
1614
1618
|
|
1619
|
+
def on(evt_name = nil, &block)
|
1620
|
+
if block_given?
|
1621
|
+
@on[evt_name.to_sym] = block
|
1622
|
+
else
|
1623
|
+
@on[evt_name.to_sym] or @empty_block
|
1624
|
+
end
|
1625
|
+
end
|
1626
|
+
|
1615
1627
|
def on_message(msg=nil, bundle=nil, &block)
|
1616
1628
|
#puts "received message #{msg && msg.to_s[0..15]}"
|
1617
1629
|
if block_given?
|
@@ -1657,6 +1669,7 @@ class Publisher
|
|
1657
1669
|
@accept = opt[:accept]
|
1658
1670
|
@verbose = opt[:verbose]
|
1659
1671
|
@on_response = opt[:on_response]
|
1672
|
+
@http2 = opt[:http2]
|
1660
1673
|
|
1661
1674
|
@ws_wait_until_response = true
|
1662
1675
|
|
@@ -1797,6 +1810,7 @@ class Publisher
|
|
1797
1810
|
headers = {:'Content-Type' => content_type, :'Accept' => accept}
|
1798
1811
|
headers[:'X-Eventsource-Event'] = eventsource_event if eventsource_event
|
1799
1812
|
headers.merge! @extra_headers if @extra_headers
|
1813
|
+
|
1800
1814
|
post = Typhoeus::Request.new(
|
1801
1815
|
@url,
|
1802
1816
|
headers: headers,
|
@@ -1804,7 +1818,8 @@ class Publisher
|
|
1804
1818
|
body: body,
|
1805
1819
|
timeout: @timeout || PUBLISH_TIMEOUT,
|
1806
1820
|
connecttimeout: @timeout || PUBLISH_TIMEOUT,
|
1807
|
-
verbose: @verbose
|
1821
|
+
verbose: @verbose,
|
1822
|
+
http_version: @http2 ? :httpv2_0 : :none
|
1808
1823
|
)
|
1809
1824
|
if body && @messages
|
1810
1825
|
msg=Message.new body
|
@@ -0,0 +1,111 @@
|
|
1
|
+
class Rdsck
|
2
|
+
attr_accessor :url, :verbose, :namespace
|
3
|
+
attr_accessor :redis, :masters
|
4
|
+
def initialize(opt)
|
5
|
+
@url=opt[:url]
|
6
|
+
@verbose=opt[:verbose]
|
7
|
+
@namespace=opt[:namespace]
|
8
|
+
end
|
9
|
+
|
10
|
+
def cluster?
|
11
|
+
@cluster_mode
|
12
|
+
end
|
13
|
+
|
14
|
+
def connect
|
15
|
+
begin
|
16
|
+
@redis=Redis.new url: $opt[:url]
|
17
|
+
mode = redis.info["redis_mode"]
|
18
|
+
rescue StandardError => e
|
19
|
+
STDERR.puts e.message
|
20
|
+
return false
|
21
|
+
end
|
22
|
+
|
23
|
+
if mode == "cluster"
|
24
|
+
@redis.close
|
25
|
+
begin
|
26
|
+
@redis=Redis.new cluster: [$opt[:url]]
|
27
|
+
@redis.ping
|
28
|
+
rescue StandardError => e
|
29
|
+
STDERR.puts e.message
|
30
|
+
return false
|
31
|
+
end
|
32
|
+
|
33
|
+
@cluster_mode = true
|
34
|
+
@masters = []
|
35
|
+
|
36
|
+
redis.connection.each do |c|
|
37
|
+
node = Redis.new url: c[:id]
|
38
|
+
@masters << node
|
39
|
+
end
|
40
|
+
else
|
41
|
+
@masters = [@redis]
|
42
|
+
end
|
43
|
+
|
44
|
+
dbg "Connected to Redis #{mode == "cluster" ? "cluster" : "server"}"
|
45
|
+
(Array === @redis.connection ? @redis.connection : [@redis.connection]) .each do |v|
|
46
|
+
dbg " #{v[:id]}"
|
47
|
+
end
|
48
|
+
self
|
49
|
+
end
|
50
|
+
|
51
|
+
def key(subkey=nil)
|
52
|
+
k = "{channel:#{$opt[:namespace]}/#{$opt[:channel_id]}}"
|
53
|
+
return subkey ? "#{k}:#{subkey}" : k
|
54
|
+
end
|
55
|
+
|
56
|
+
def info
|
57
|
+
channel_hash=@redis.hgetall key
|
58
|
+
hash_ttl=@redis.ttl key
|
59
|
+
channel_subs=@redis.hgetall key("subscribers")
|
60
|
+
#...
|
61
|
+
end
|
62
|
+
|
63
|
+
def filter_channels(filters={})
|
64
|
+
script = <<~EOF
|
65
|
+
local prev_cursor = ARGV[1]
|
66
|
+
local pattern = ARGV[2]
|
67
|
+
local scan_batch_size = ARGV[3]
|
68
|
+
|
69
|
+
local min_subscribers = ARGV[4] and #ARGV[4] > 0 and tonumber(ARGV[4])
|
70
|
+
|
71
|
+
local cursor, iteration
|
72
|
+
if pattern and #pattern > 0 then
|
73
|
+
cursor, iteration = unpack(redis.call("SCAN", prev_cursor, "MATCH", pattern, "COUNT", scan_batch_size))
|
74
|
+
else
|
75
|
+
cursor, iteration = unpack(redis.call("SCAN", prev_cursor, "COUNT", scan_batch_size))
|
76
|
+
end
|
77
|
+
|
78
|
+
local matched = {}
|
79
|
+
for _, chankey in pairs(iteration) do
|
80
|
+
local match = true
|
81
|
+
if min_subscribers then
|
82
|
+
match = match and (tonumber(redis.call('HGET', chankey, 'fake_subscribers') or 0) >= min_subscribers)
|
83
|
+
end
|
84
|
+
if match then
|
85
|
+
table.insert(matched, chankey)
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
return {cursor, matched}
|
90
|
+
EOF
|
91
|
+
|
92
|
+
results = []
|
93
|
+
batch_size=2
|
94
|
+
masters.each do |m|
|
95
|
+
hash = m.script "load", script
|
96
|
+
cursor, pattern = "0", "{channel:*}"
|
97
|
+
loop do
|
98
|
+
cursor, batch_results = m.evalsha hash, keys: [], argv: [cursor, pattern, batch_size, filters[:min_subscribers]]
|
99
|
+
results += batch_results
|
100
|
+
pattern = ""
|
101
|
+
break if cursor.to_i == 0
|
102
|
+
end
|
103
|
+
end
|
104
|
+
results
|
105
|
+
|
106
|
+
results.map! do |key|
|
107
|
+
m = key.match(/^\{channel\:(.*)\}$/)
|
108
|
+
m[1] || key
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
data/lib/nchan_tools/version.rb
CHANGED
data/nchan_tools.gemspec
CHANGED
@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
|
|
34
34
|
spec.add_dependency 'websocket-extensions'
|
35
35
|
spec.add_dependency "permessage_deflate"
|
36
36
|
spec.add_dependency 'http_parser.rb'
|
37
|
-
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.2')
|
38
|
-
|
39
|
-
end
|
37
|
+
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.2')
|
38
|
+
spec.add_dependency 'http-2'
|
39
|
+
end
|
40
40
|
spec.add_development_dependency "pry"
|
41
41
|
spec.add_development_dependency "bundler", "~> 1.16"
|
42
42
|
spec.add_development_dependency "rake", "~> 10.0"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nchan_tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Leo Ponomarev
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-12-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: typhoeus
|
@@ -212,6 +212,7 @@ email:
|
|
212
212
|
executables:
|
213
213
|
- nchan-benchmark
|
214
214
|
- nchan-pub
|
215
|
+
- nchan-redis-debug
|
215
216
|
- nchan-sub
|
216
217
|
extensions: []
|
217
218
|
extra_rdoc_files: []
|
@@ -226,17 +227,19 @@ files:
|
|
226
227
|
- bin/setup
|
227
228
|
- exe/nchan-benchmark
|
228
229
|
- exe/nchan-pub
|
230
|
+
- exe/nchan-redis-debug
|
229
231
|
- exe/nchan-sub
|
230
232
|
- lib/nchan_tools.rb
|
231
233
|
- lib/nchan_tools/benchmark.rb
|
232
234
|
- lib/nchan_tools/pubsub.rb
|
235
|
+
- lib/nchan_tools/rdsck.rb
|
233
236
|
- lib/nchan_tools/version.rb
|
234
237
|
- nchan_tools.gemspec
|
235
238
|
homepage: https://nchan.io
|
236
239
|
licenses:
|
237
240
|
- WTFPL
|
238
241
|
metadata: {}
|
239
|
-
post_install_message:
|
242
|
+
post_install_message:
|
240
243
|
rdoc_options: []
|
241
244
|
require_paths:
|
242
245
|
- lib
|
@@ -251,9 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
251
254
|
- !ruby/object:Gem::Version
|
252
255
|
version: '0'
|
253
256
|
requirements: []
|
254
|
-
|
255
|
-
|
256
|
-
signing_key:
|
257
|
+
rubygems_version: 3.1.4
|
258
|
+
signing_key:
|
257
259
|
specification_version: 4
|
258
260
|
summary: Development and testing utilities for Nchan
|
259
261
|
test_files: []
|