Skip to content
This repository has been archived by the owner on Feb 15, 2018. It is now read-only.

Commit

Permalink
refactor Monitor#parse to happen at an instance level
Browse files Browse the repository at this point in the history
  • Loading branch information
@qrush
qrush committed Apr 21, 2011
1 parent 4ab18ac commit 4d9be85
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 86 deletions.
10 changes: 4 additions & 6 deletions lib/daikon/monitor.rb
View file
Expand Up @@ -12,10 +12,8 @@ class Monitor
OLD_SINGLE_FORMAT = /^(#{NO_ARG_COMMANDS.join('|')})$/i
OLD_MORE_FORMAT = /^[A-Z]+ .*$/i

def initialize(redis = nil, logger = nil)
@redis = redis
@logger = logger
@mutex = Mutex.new
def self.parse(line)
new.parse(line)
end

def self.reset
Expand Down Expand Up @@ -45,9 +43,9 @@ def summaries
self.class.summaries
end

def start
def self.start(redis)
Thread.new do
@redis.monitor do |line|
redis.monitor do |line|
parse(line)
end
end
Expand Down
152 changes: 82 additions & 70 deletions spec/monitor_spec.rb
View file
Expand Up @@ -12,17 +12,17 @@

describe Daikon::Monitor, ".pop with summaries" do
before do
subject.parse("INCR foo")
subject.parse("DECR foo")
subject.parse("DECR baz")
subject.parse("HGETALL faz")
subject.parse("PING")
parse("INCR foo")
parse("DECR foo")
parse("DECR baz")
parse("HGETALL faz")
parse("PING")
end

it "only saves the top 100 key listings" do
150.times { |n| subject.parse("INCR foo#{n}") }
150.times { |n| subject.parse("DECR foo#{n}") }
100.times { |n| subject.parse("DEL foo#{n}") }
150.times { |n| parse("INCR foo#{n}") }
150.times { |n| parse("DECR foo#{n}") }
100.times { |n| parse("DEL foo#{n}") }

Daikon::Monitor.pop do |summary|
summary["keys"].size.should == 100
Expand All @@ -31,7 +31,7 @@
end

it "santizes key names" do
subject.parse("INCR $foo.zomg")
parse("INCR $foo.zomg")

Daikon::Monitor.pop do |summary|
summary["keys"]["$foo.zomg"].should be_nil
Expand Down Expand Up @@ -64,120 +64,132 @@
end

describe Daikon::Monitor, "#parse with new format" do
subject { Daikon::Monitor.new }
let(:line) { '1291699658.994073 "decrby" "fooz" "2000"' }
before do
parse('1291699658.994073 "decrby" "fooz" "2000"')
end

it "parses the log into json" do
subject.parse(line)
subject.summaries["commands"]["DECRBY"].should == 1
subject.summaries["keys"]["fooz"].should == 1
subject.summaries["totals"]["all"].should == 1
subject.summaries["totals"]["write"].should == 1
Daikon::Monitor.pop do |summary|
summary["commands"]["DECRBY"].should == 1
summary["keys"]["fooz"].should == 1
summary["totals"]["all"].should == 1
summary["totals"]["write"].should == 1
end
end
end

describe Daikon::Monitor, "#parse with new format that has reply byte" do
subject { Daikon::Monitor.new }
let(:line) { '+1291699658.994073 "decrby" "fooz" "2000"' }
before do
parse('+1291699658.994073 "decrby" "fooz" "2000"')
end

it "parses the log into json" do
subject.parse(line)
subject.summaries["commands"]["DECRBY"].should == 1
subject.summaries["keys"]["fooz"].should == 1
subject.summaries["totals"]["all"].should == 1
subject.summaries["totals"]["write"].should == 1
Daikon::Monitor.pop do |summary|
summary["commands"]["DECRBY"].should == 1
summary["keys"]["fooz"].should == 1
summary["totals"]["all"].should == 1
summary["totals"]["write"].should == 1
end
end
end

describe Daikon::Monitor, "#parse with old multi line input" do
subject { Daikon::Monitor.new }
before do
parse("incr foo")
parse("sismember project-13897-global-error-classes 17")
parse("incrApiParameterError")
parse("decr foo")
end

it "parses logs" do
subject.parse("incr foo")
subject.parse("sismember project-13897-global-error-classes 17")
subject.parse("incrApiParameterError")
subject.parse("decr foo")

subject.summaries["commands"]["DECR"].should == 1
subject.summaries["commands"]["INCR"].should == 1
subject.summaries["commands"]["SISMEMBER"].should == 1
subject.summaries["keys"]["foo"].should == 2
subject.summaries["keys"]["project-13897-global-error-classes"].should == 1
subject.summaries["totals"]["all"].should == 3
subject.summaries["totals"]["write"].should == 2
subject.summaries["totals"]["read"].should == 1
Daikon::Monitor.pop do |summary|
subject.summaries["commands"]["DECR"].should == 1
subject.summaries["commands"]["INCR"].should == 1
subject.summaries["commands"]["SISMEMBER"].should == 1
subject.summaries["keys"]["foo"].should == 2
subject.summaries["keys"]["project-13897-global-error-classes"].should == 1
subject.summaries["totals"]["all"].should == 3
subject.summaries["totals"]["write"].should == 2
subject.summaries["totals"]["read"].should == 1
end
end
end

describe Daikon::Monitor, "#parse with old input" do
subject { Daikon::Monitor.new }

shared_examples_for "a valid parser" do
it "parses the given commands properly" do
subject.summaries["commands"]["DECR"].should == 1
subject.summaries["commands"]["INCR"].should == 1
subject.summaries["commands"]["SET"].should == 1
subject.summaries["keys"]["foo"].should == 2
subject.summaries["keys"]["g:2470920:mrn"].should == 1
subject.summaries["totals"]["all"].should == 3
subject.summaries["totals"]["write"].should == 3
Daikon::Monitor.pop do |summary|
subject.summaries["commands"]["DECR"].should == 1
subject.summaries["commands"]["INCR"].should == 1
subject.summaries["commands"]["SET"].should == 1
subject.summaries["keys"]["foo"].should == 2
subject.summaries["keys"]["g:2470920:mrn"].should == 1
subject.summaries["totals"]["all"].should == 3
subject.summaries["totals"]["write"].should == 3
end
end
end

context "with a bulk input that is a number" do
before do
subject.parse("incr foo")
subject.parse("set g:2470920:mrn 9")
subject.parse("554079885")
subject.parse("decr foo")
parse("incr foo")
parse("set g:2470920:mrn 9")
parse("554079885")
parse("decr foo")
end
it_should_behave_like "a valid parser"
end

context "with a bulk input that is a number" do
before do
subject.parse("incr foo")
subject.parse("set g:2470920:mrn 9")
subject.parse("46fdcf77c1bb2108e6191602c2f5f9ae")
subject.parse("decr foo")
parse("incr foo")
parse("set g:2470920:mrn 9")
parse("46fdcf77c1bb2108e6191602c2f5f9ae")
parse("decr foo")
end
it_should_behave_like "a valid parser"
end
end

describe Daikon::Monitor, "#parse with a bad command name" do
it "does not save command" do
subject.parse("gmail foo")
subject.summaries["commands"].size.should be_zero
parse("gmail foo")
Daikon::Monitor.pop do |summary|
summary["commands"].size.should be_zero
end
end
end

describe Daikon::Monitor, "#parse with namespaces" do
before do
subject.parse("set g:2470920:mrn 9")
subject.parse("get g:2470914:mrn")
subject.parse("incr s3-queue-key")
subject.parse("info")
subject.parse("decr somehorriblynamespacedkey")
subject.parse("flushdb")
parse("set g:2470920:mrn 9")
parse("get g:2470914:mrn")
parse("incr s3-queue-key")
parse("info")
parse("decr somehorriblynamespacedkey")
parse("flushdb")
end

it "keeps track of namespace accesses" do
subject.summaries["namespaces"]["g"].should == 2
subject.summaries["namespaces"]["global"].should == 3
subject.summaries["namespaces"]["s3"].should == 1
Daikon::Monitor.pop do |summary|
summary["namespaces"]["g"].should == 2
summary["namespaces"]["global"].should == 3
summary["namespaces"]["s3"].should == 1
end
end
end

describe Daikon::Monitor, "#parse with values that have spaces" do
before do
subject.parse("set g:2470920:mrn 11")
subject.parse("Email Error")
parse("set g:2470920:mrn 11")
parse("Email Error")
end

it "counts them properly" do
subject.summaries["commands"].should == {"SET" => 1}
subject.summaries["keys"].should == {"g:2470920:mrn" => 1}
subject.summaries["namespaces"].should == {"g" => 1}
Daikon::Monitor.pop do |summary|
summary["commands"].should == {"SET" => 1}
summary["keys"].should == {"g:2470920:mrn" => 1}
summary["namespaces"].should == {"g" => 1}
end
end
end
16 changes: 6 additions & 10 deletions spec/spec_helper.rb
View file
Expand Up @@ -10,20 +10,16 @@
require 'timecop'
require 'bourne'

require 'support/capture_helper'
require 'support/parse_helper'

RSpec.configure do |config|
config.mock_with :mocha

config.include CaptureHelper
config.include ParseHelper

config.before do
Daikon::Monitor.reset
end
end

# http://pivotallabs.com/users/alex/blog/articles/853-capturing-standard-out-in-unit-tests
def capture
output = StringIO.new
$stderr = output
yield
output.string
ensure
$stderr = STDERR
end

0 comments on commit 4d9be85

Please sign in to comment.