heartbeat-client 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/hbc

@@ -17,10 +17,22 @@ unless @config['apikey']
   exit
 end
 
+unless @config['endpoint']
+  puts "Service Endpoint not found!"
+  exit
+end
+
 if ARGV and ARGV.size == 1
-  Daemons.run_proc('heartbeat-client.rb') do
+  Daemons.run_proc('heartbeat-client.rb', :dir => File.join('/tmp'), :monitor => true,
+    :backtrace => true, :monitor => true) do
+    Heartbeat.log = Logger.new('/tmp/heartbeat.log')
     loop do
-      Heartbeat.create(@config['apikey'], @config['endpoint'], @config['name'])
+      begin
+        Heartbeat.create(@config['apikey'], @config['endpoint'], @config['name'])
+      rescue => e
+        puts e.message
+      end
+      GC.start
       sleep(30)
     end
   end

data/lib/heartbeat-client.rb

@@ -14,11 +14,17 @@ class Heartbeat
     RUBY_PLATFORM.downcase.include?("linux")
   end
   
+  def self.log=(logger)
+    @@log = logger
+  end
+
   def self.log
-    Logger.new('/tmp/heartbeat.log')
+    @@log
   end
-  
+
   def self.create(apikey, endpoint, name = nil)
+    log.info("#create - Collecting data...")
+    
     procs = {'total' => 0, 'running' => 0, 'stuck' => 0, 'sleeping' => 0, 'threads' => 0, 'stopped' => 0, 'zombie' => 0}
     load_avg = []
     cpu_usage = {'user' => 0, 'sys' => 0, 'idle' => 0}
@@ -26,13 +32,15 @@ class Heartbeat
     memory = {'free' => 0, 'used' => 0}
     disks = {}
     swap = {'free' => 0, 'used' => 0}
-
+  
+    log.debug("Dumping top output...")
     if is_linux?
       `top -b -n1 > /tmp/top.out`
     else
       `top -l 1 > /tmp/top.out`
     end
-
+    
+    log.debug("Dumping df output...")
     `df -m > /tmp/dfm.out`
 
     if File.exists?('/tmp/top.out')
@@ -87,10 +95,13 @@ class Heartbeat
           }
         }
       }
-
-      Heartbeat.post(endpoint + '/heartbeat', options)
+      
+      log.info("#create - Sending data to endpoint...")
+      res = Heartbeat.post(endpoint + '/heartbeat', options)
+      log.debug("Response: #{res.response.inspect}") if res
+      log.info("Finished iteration.")
     else
-      put "No top output found."
+      log.error "No top output found."
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heartbeat-client
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement