crusher 0.0.6 → 0.0.7

data/lib/crusher/crush_session.rb

@@ -1,7 +1,7 @@
 module Crusher
   class CrushSession
     
-    attr_reader :target, :scenario, :log_file
+    attr_reader :target, :scenario, :logger
     
     def initialize(target, scenario, options = {})
       @target = target
@@ -26,12 +26,8 @@ module Crusher
     end
     
     def log(message)
-      log_message = Time.now.strftime('%Y-%m-%d %H:%M:%S') + ' ' + @current_phase + ' ' +  message + "\n"
-      if @log_file
-        @log_file.syswrite(log_message)
-      else
-        puts log_message
-      end
+      log_message = @current_phase + ' ' +  message
+      @logger.info log_message
       nil
     end
     
@@ -73,8 +69,11 @@ module Crusher
       return nil if @queued_jobs.length == 0
 
       fork do
-        
-        @log_file = File.open(@options.delete(:log_file), 'a') if @options[:log_file]
+        log_output = @options[:log_file] ? @options.delete(:log_file) : STDOUT
+        @logger = Logger.new(log_output, File::APPEND)
+        formatter = Logger::Formatter.new
+        formatter.datetime_format = "%Y-%m-%d %H:%M:%S"
+        @logger.formatter = formatter
         
         # Reseed the pseudorandom number generator with the process's PID file, otherwise
         # we'll inherit our sequence of random numbers from the parent process
@@ -92,7 +91,6 @@ module Crusher
       end
 
       @queued_jobs = []
-
       nil
     end
     

data/lib/crusher/load_generator.rb

@@ -7,12 +7,7 @@ module Crusher
       @options = options
       
       Dir.mkdir @options[:stats_log_dir] if @options[:stats_log_dir] && !File.exist?(@options[:stats_log_dir])
-      
-      begin
-        @log_file = File.open(options[:log_file], 'a') if options[:log_file] 
-      rescue Errno::ENOENT
-        log("Log file #{options[:log_file]} couldn't be opened; logging to STDOUT")
-      end    
+
     end
     
     def act!; end
@@ -27,6 +22,7 @@ module Crusher
       keys, values = data.map{|k,v| [k.to_s,v.to_s] }.transpose
       stats_log_file(event_type) do |file|
         file.syswrite "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')},#{values.join(',')}\n"
+        file.flush unless file.fsync
       end
     end
     

data/lib/crusher.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'rubygems'
 require 'crusher/crush_session'
 require 'crusher/load_generator'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crusher
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - phene