dummy_log_generator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edaffe0f73cbc9aafc71dc10db3eeb80bfed02d6
-  data.tar.gz: 807e80562f29882db31edee29b8dac692e098caa
+  metadata.gz: 760e8bbf26f9bfcc32494aed36086f062ee5fe28
+  data.tar.gz: 64cfb639cc486f51dcf403020b5085c5dc9216ee
 SHA512:
-  metadata.gz: a229cbbf0c5863bd2d5a17417d3074d73f6f71c58f53a763a81959f4dd79f4b6e356454ccc7414a2094c90974e950f6ad18203ad6d68174cc51f7e9dfe6c1a4b
-  data.tar.gz: 7b220a87b3e6296d436198e16be03ce7fd2a2a3b391f0f8a925e474c3fb04d007006da2ee627a982751ff43956bfbc7923c5bf4f3e1f9c402133fc3239af14b9
+  metadata.gz: 0958e911b83801d2b133b2d25689e930f3dc3c0771ba87f7fca57e45a25599fa6bed97d5f8aad6ee448e5cd4a4dbb3dcd0f766717c77a0cbd7cd6b7cae5bf8c3
+  data.tar.gz: 6ca6c0a19b9740d2b8063094427eb6acc723d5b41bc84957bcdce6c2d83d9b6246f65e58ecc37b58babc5f0d3fc292d5c4920020215645bbb510f0f50fd01395

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.2.1
+
+Change:
+
+  * Change the default behavior to use the default `message` rather than `field`.
+
 ### 0.2.0
 
 Enhancement:

data/README.md

@@ -47,8 +47,8 @@ configure 'sample' do
   rate 500
   delimiter "\t"
   labeled true
-  field :id, type: :integer, countup: true
-  field :time, type: :datetime, format: "[%Y-%m-%d %H:%M:%S]", random: true
+  field :id, type: :integer, countup: true, format: "%04d"
+  field :time, type: :datetime, format: "[%Y-%m-%d %H:%M:%S]", random: false
   field :level, type: :string, any: %w[DEBUG INFO WARN ERROR]
   field :method, type: :string, any: %w[GET POST PUT]
   field :uri, type: :string, any: %w[/api/v1/people /api/v1/textdata /api/v1/messages]
@@ -66,9 +66,9 @@ $ dummy_log_genrator -c dummy_log_generator.conf
 Outputs to the `dummy.log` (specified by `output` parameter) file like: 
 
 ```
-id:422  time:[2013-11-19 02:34:58]  level:INFO  method:POST uri:/api/v1/textdata  reqtime:3.9726677258569842  foobar:LFK6XV1N
-id:423  time:[2013-11-19 02:34:58]  level:DEBUG method:GET  uri:/api/v1/people    reqtime:0.49912949125272277 foobar:DcOYrONH
-id:424  time:[2013-11-19 02:34:58]  level:WARN  method:POST uri:/api/v1/textdata  reqtime:2.930590441869852   foobar:XEZ5bQsh
+id:0422  time:[2013-11-19 02:34:58]  level:INFO  method:POST uri:/api/v1/textdata  reqtime:3.9726677258569842  foobar:LFK6XV1N
+id:0423  time:[2013-11-19 02:34:58]  level:DEBUG method:GET  uri:/api/v1/people    reqtime:0.49912949125272277 foobar:DcOYrONH
+id:0424  time:[2013-11-19 02:34:58]  level:WARN  method:POST uri:/api/v1/textdata  reqtime:2.930590441869852   foobar:XEZ5bQsh
 ```
 
 ### Configuration Parameters
@@ -97,15 +97,15 @@ Following parameters in the configuration file are available:
 
 * field
 
-    Define data fields to generate
+    Define data fields to generate. `message` and `field` are ignored. 
 
-* message
+* input
 
-    Use this if you want to write only a specific message. `field` is ignored. 
+    Use this if you want to write messages by reading lines of an input file in rotation. `field` is ignored.
 
-* input
+* message
 
-    Use this if you want to write messages by reading lines of an input file in rotation. `field` and `message` are ignored. 
+    Use this if you want to write only a specific message. 
 
 ### Field Data Types
 

data/example/input.conf

@@ -0,0 +1,6 @@
+configure 'input' do
+  output "dummy_log_generator.log"
+  rate 500
+  input "example/input.txt"
+end
+

data/example/input.txt

@@ -0,0 +1,10 @@
+id:0	time:2013-11-26 02:45:33 +0900	level:WARN	method:GET	uri:/api/v1/people	reqtime:2.3955637407914354	foobar:3xwwVG3T
+id:1	time:2013-11-26 02:45:33 +0900	level:INFO	method:POST	uri:/api/v1/people	reqtime:4.954494736221596	foobar:kRP5SiBW
+id:2	time:2013-11-26 02:45:33 +0900	level:DEBUG	method:POST	uri:/api/v1/people	reqtime:1.719978260834408	foobar:0EFaal3L
+id:3	time:2013-11-26 02:45:33 +0900	level:DEBUG	method:POST	uri:/api/v1/people	reqtime:3.2873443102110755	foobar:sGMFl2xs
+id:4	time:2013-11-26 02:45:33 +0900	level:INFO	method:POST	uri:/api/v1/textdata	reqtime:1.8776513072710397	foobar:dTlmjln3
+id:5	time:2013-11-26 02:45:33 +0900	level:INFO	method:POST	uri:/api/v1/people	reqtime:2.7644992372264974	foobar:jLL6zTdt
+id:6	time:2013-11-26 02:45:33 +0900	level:WARN	method:POST	uri:/api/v1/people	reqtime:4.609761906663468	foobar:k2hegeOG
+id:7	time:2013-11-26 02:45:33 +0900	level:DEBUG	method:POST	uri:/api/v1/people	reqtime:1.7312535151311619	foobar:JpwUkYKs
+id:8	time:2013-11-26 02:45:33 +0900	level:WARN	method:POST	uri:/api/v1/people	reqtime:2.2088570489185217	foobar:eOSmfjCb
+id:9	time:2013-11-26 02:45:33 +0900	level:WARN	method:POST	uri:/api/v1/people	reqtime:2.6351789530831637	foobar:cFBI2Gsm

data/example/message.conf

@@ -0,0 +1,5 @@
+configure 'message' do
+  output "dummy_log_generator.log"
+  rate 500
+  message "time:2013-11-25 00:23:52 +0900\tlevel:ERROR\tmethod:POST\turi:/api/v1/people\treqtime:3.1983877060667103\n"
+end

data/{dummy_log_generator.conf → example/sample.conf}

@@ -1,5 +1,5 @@
 configure 'sample' do
-  # output "dummy_log_generator.log"
+  output "dummy_log_generator.log"
   rate 500
   delimiter "\t"
   labeled true

data/lib/dummy_log_generator/cli.rb

@@ -22,13 +22,16 @@ module DummyLogGenerator
     option :worker_type,                     :type => :string, :default => 'process'
     def start
       @options = @options.dup # avoid frozen
-      if options[:config] && File.exists?(options[:config])
-        dsl = instance_eval(File.read(options[:config]), options[:config])
-        @options[:setting] = dsl.setting
-        @options[:rate]    ||= dsl.setting.rate
-        # options for serverengine
-        @options[:workers] ||= dsl.setting.workers
-      end
+      dsl =
+        if options[:config] && File.exists?(options[:config])
+          instance_eval(File.read(options[:config]), options[:config])
+        else
+          DummyLogGenerator::Dsl.new
+        end
+      @options[:setting] = dsl.setting
+      @options[:rate]    ||= dsl.setting.rate
+      # options for serverengine
+      @options[:workers] ||= dsl.setting.workers
 
       opts = @options.symbolize_keys.except(:config)
       se = ServerEngine.create(nil, DummyLogGenerator::Worker, opts)

data/lib/dummy_log_generator/dsl.rb

@@ -15,6 +15,7 @@ module DummyLogGenerator
     end
 
     def field(name, opts)
+      setting.fields ||= {}
       setting.fields[name] = opts
     end
   end

data/lib/dummy_log_generator/generator.rb

@@ -2,13 +2,14 @@ module DummyLogGenerator
   class Generator
     def initialize(setting)
       @message_proc =
-        if input = setting.input
+        if fields = setting.fields
+          labeled, delimiter = setting.labeled, setting.delimiter
+          prepare_message_proc_for_fields(fields, labeled, delimiter)
+        elsif input = setting.input
           prepare_message_proc_for_input(input)
-        elsif message = setting.message
-          prepare_message_proc_for_message(message)
         else
-          fields, labeled, delimiter = setting.fields, setting.labeled, setting.delimiter
-          prepare_message_proc_for_fields(fields, labeled, delimiter)
+          message = setting.message
+          prepare_message_proc_for_message(message)
         end
     end
 

data/lib/dummy_log_generator/setting.rb

@@ -7,9 +7,9 @@ module DummyLogGenerator
       @output = STDOUT
       @labeled = true
       @delimiter = "\t"
-      @fields = {}
+      @fields = nil
       @workers = 1
-      @message = nil
+      @message = "time:2013-11-25 00:23:52 +0900\tlevel:ERROR\tmethod:POST\turi:/api/v1/people\treqtime:3.1983877060667103\n"
       @input = nil
     end
   end

data/lib/dummy_log_generator/version.rb

@@ -1,3 +1,3 @@
 module DummyLogGenerator
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dummy_log_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - sonots
@@ -128,8 +128,11 @@ files:
 - bin/dummy_log_generator
 - bin/dummy_log_generator_simple
 - bin/dummy_log_generator_yes
-- dummy_log_generator.conf
 - dummy_log_generator.gemspec
+- example/input.conf
+- example/input.txt
+- example/message.conf
+- example/sample.conf
 - lib/dummy_log_generator.rb
 - lib/dummy_log_generator/cli.rb
 - lib/dummy_log_generator/dsl.rb