bipbip 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db42c48899ca1b505940c48ee73bb1c3b63c1bc5
-  data.tar.gz: 8148d92d85f7654f58050188a0868d4231480ca4
+  metadata.gz: ed5dd8b5457dc9bf2b7542ffc50667195f588742
+  data.tar.gz: f7f8a323faf65296263a40b056f56b0708862812
 SHA512:
-  metadata.gz: 015d0a47ea3ed3d61c0e1b076b0c49e521fd1438a65c8f437d4cc0e3789dcd960d45c8db2d80f3d5dfb65bf071a0e4dd25b9c0121659c94c7406b532f8cb004f
-  data.tar.gz: cf50716d8156361d0795a62b307f1bf731be6d5a8ab812ee3b0cc72116be867f89ccc9735d1f977fa69ff02ff527468be71a07fdc7a1160c37b4ca42b3a6cb71
+  metadata.gz: 7f79b1e624132364c18f7a82831d73d18b5f074ff84a9d944f2f077936b3b6a9cf2af154fd1d74ee75bffdeee7f2d7a64bf3809c22317e12751f448a4425082d
+  data.tar.gz: efc5c47e03a5026c5a717a28a20e4d0de03c43292fed109b3163320910ac4e9548c9df0348db621a77c7b0c245bb197f824536af11a1c27b39fae394297f1807

data/lib/bipbip/plugin.rb

@@ -21,8 +21,7 @@ module Bipbip
     # @param [Bipbip::Plugin] plugin
     # @return [Bipbip::Plugin]
     def self.factory_from_plugin(plugin)
-      class_name = plugin.class.name.gsub(/^Bipbip::/, '')
-      Bipbip::const_get(class_name).new(plugin.name, plugin.config, plugin.frequency, plugin.tags, plugin.metric_group)
+      plugin.class.new(plugin.name, plugin.config, plugin.frequency, plugin.tags, plugin.metric_group)
     end
 
     def initialize(name, config, frequency, tags = nil, metric_group = nil)

data/lib/bipbip/plugin/log_parser.rb

@@ -45,9 +45,11 @@ module Bipbip
 
     def notifier
       if @notifier.nil?
-        @notifier = create_notifier
+        file_stat = File.stat(config['path'])
+        raise "Cannot read file `#{config['path']}`" unless file_stat.readable?
         @lines = []
-        @size = File.stat(config['path']).size
+        @size = file_stat.size
+        @notifier = create_notifier
       end
       @notifier
     end

data/lib/bipbip/plugin/mongodb.rb

@@ -78,28 +78,27 @@ module Bipbip
       config['slow_query_threshold'] || 0
     end
 
-    # @return [Mongo::MongoClient]
+    # @return [Mongo::Client]
     def mongodb_client
       options = {
           'hostname' => 'localhost',
           'port' => 27017,
       }.merge(config)
-      @mongodb_client ||= Mongo::MongoClient.new(options['hostname'], options['port'], {:op_timeout => 2, :slave_ok => true})
+      @mongodb_client ||= Mongo::Client.new([options['hostname'] + ':' + options['port'].to_s], :socket_timeout => 2, :slave_ok => true)
     end
 
     # @return [Mongo::DB]
     def mongodb_database(db_name)
-      db = mongodb_client.db(db_name)
-      db.authenticate(config['username'], config['password']) unless config['password'].nil?
-      db
+      mongodb_client.with(config['username'], config['password']) unless config['password'].nil?
+      mongodb_client.use(db_name)
     end
 
     def fetch_server_status
-      mongodb_database('admin').command('serverStatus' => 1)
+      mongodb_database('admin').command('serverStatus' => 1).documents.first
     end
 
     def fetch_replica_status
-      mongodb_database('admin').command('replSetGetStatus' => 1)
+      mongodb_database('admin').command('replSetGetStatus' => 1).documents.first
     end
 
     def slow_query_last_check
@@ -117,14 +116,14 @@ module Bipbip
 
       stats = database_list.reduce({'total' => {'count' => 0, 'time' => 0}, 'max' => {'time' => 0}}) do |memo, database|
 
-        results = database.collection('system.profile').aggregate(
+        results = database['system.profile'].find.aggregate(
             [
                 {'$match' => {'millis' => {'$gte' => slow_query_threshold}, 'ts' => {'$gt' => timestamp_last_check}}},
                 {'$group' => {'_id' => 'null', 'total_count' => {'$sum' => 1}, 'total_time' => {'$sum' => '$millis'}, 'max_time' => {'$max' => '$millis'}}}
             ])
 
-        unless results.empty?
-          result = results.pop
+        unless results.count == 0
+          result = results.first
           max_time = result['max_time'].to_f/1000
 
           memo['total']['count'] += result['total_count']

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -116,28 +116,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement