appstats 0.17.2 → 0.17.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +1 -1
- data/config/appstats.yml.example +2 -0
- data/lib/appstats/result_job.rb +21 -0
- data/lib/appstats/test_unloaded_query.rb +9 -0
- data/lib/appstats/version.rb +1 -1
- data/lib/daemons/appstats_log_collector.rb +2 -0
- data/spec/entry_spec.rb +8 -8
- data/spec/logger_spec.rb +22 -22
- data/spec/result_job_spec.rb +29 -0
- metadata +4 -3
data/Gemfile.lock
CHANGED
data/config/appstats.yml.example
CHANGED
data/lib/appstats/result_job.rb
CHANGED
@@ -19,6 +19,27 @@ module Appstats
|
|
19
19
|
end
|
20
20
|
alias_method :eql?, :==
|
21
21
|
|
22
|
+
def self.require_third_party_queries(queries)
|
23
|
+
if queries.nil?
|
24
|
+
Appstats.log(:info, "No third party query provided.")
|
25
|
+
return
|
26
|
+
end
|
27
|
+
queries.each do |q|
|
28
|
+
if q[:path].nil?
|
29
|
+
Appstats.log(:info, "Please specify the third party query ':path'.")
|
30
|
+
next
|
31
|
+
end
|
32
|
+
unless File.exists?(q[:path])
|
33
|
+
Appstats.log(:info, "Unable to find third party query [#{q[:path]}].")
|
34
|
+
next
|
35
|
+
end
|
36
|
+
|
37
|
+
Appstats.log(:info, "Loaded to third party query [#{q[:path]}].")
|
38
|
+
require q[:path]
|
39
|
+
end
|
40
|
+
|
41
|
+
end
|
42
|
+
|
22
43
|
def self.run
|
23
44
|
count = 0
|
24
45
|
all = ResultJob.where("frequency <> 'once' or last_run_at IS NULL").all
|
data/lib/appstats/version.rb
CHANGED
@@ -55,6 +55,8 @@ while($running) do
|
|
55
55
|
end
|
56
56
|
Appstats::LogCollector.download_remote_files(appstats_config["remote_servers"])
|
57
57
|
Appstats::LogCollector.process_local_files
|
58
|
+
|
59
|
+
Appstats::ResultJob.require_third_party_queries(appstats_config["third_party_queries"])
|
58
60
|
Appstats::ResultJob.run
|
59
61
|
|
60
62
|
Appstats::Action.update_actions
|
data/spec/entry_spec.rb
CHANGED
@@ -193,18 +193,18 @@ module Appstats
|
|
193
193
|
end
|
194
194
|
|
195
195
|
it "should understand an entry without contexts" do
|
196
|
-
entry = Entry.create_from_logger_string("0.17.
|
196
|
+
entry = Entry.create_from_logger_string("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
197
197
|
Entry.count.should == @before_count + 1
|
198
198
|
entry.action.should == "address_search"
|
199
|
-
entry.raw_entry.should == "0.17.
|
199
|
+
entry.raw_entry.should == "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
200
200
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
201
201
|
end
|
202
202
|
|
203
203
|
it "should understand contexts" do
|
204
|
-
entry = Entry.create_from_logger_string("0.17.
|
204
|
+
entry = Entry.create_from_logger_string("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
205
205
|
Entry.count.should == @before_count + 1
|
206
206
|
entry.action.should == "address_filter"
|
207
|
-
entry.raw_entry.should == "0.17.
|
207
|
+
entry.raw_entry.should == "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
208
208
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
209
209
|
entry.contexts.size.should == 2
|
210
210
|
entry.contexts[0].context_key = "app_name"
|
@@ -214,10 +214,10 @@ module Appstats
|
|
214
214
|
end
|
215
215
|
|
216
216
|
it "should handle 'action' as a context" do
|
217
|
-
entry = Entry.create_from_logger_string('0.17.
|
217
|
+
entry = Entry.create_from_logger_string('0.17.3 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
|
218
218
|
Entry.count.should == @before_count + 1
|
219
219
|
entry.action.should == "page-view"
|
220
|
-
entry.raw_entry.should == "0.17.
|
220
|
+
entry.raw_entry.should == "0.17.3 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
|
221
221
|
entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
|
222
222
|
entry.contexts.size.should == 2
|
223
223
|
entry.contexts[0].context_key = "action"
|
@@ -228,10 +228,10 @@ module Appstats
|
|
228
228
|
end
|
229
229
|
|
230
230
|
it "should handle multiple of the same 'context'" do
|
231
|
-
entry = Entry.create_from_logger_string('0.17.
|
231
|
+
entry = Entry.create_from_logger_string('0.17.3 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
|
232
232
|
Entry.count.should == @before_count + 1
|
233
233
|
entry.action.should == "page-view"
|
234
|
-
entry.raw_entry.should == "0.17.
|
234
|
+
entry.raw_entry.should == "0.17.3 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
|
235
235
|
entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
|
236
236
|
entry.contexts.size.should == 2
|
237
237
|
entry.contexts[0].context_key = "app_name"
|
data/spec/logger_spec.rb
CHANGED
@@ -122,12 +122,12 @@ module Appstats
|
|
122
122
|
|
123
123
|
it "should accept numbers" do
|
124
124
|
Appstats::Logger.entry(5, :blah => 6)
|
125
|
-
Appstats::Logger.raw_read.should == ["0.17.
|
125
|
+
Appstats::Logger.raw_read.should == ["0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
|
126
126
|
end
|
127
127
|
|
128
128
|
it "should accept arrays" do
|
129
129
|
Appstats::Logger.entry('search', :provider => [ 'one', 'two' ])
|
130
|
-
Appstats::Logger.raw_read.should == ["0.17.
|
130
|
+
Appstats::Logger.raw_read.should == ["0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
|
131
131
|
end
|
132
132
|
|
133
133
|
|
@@ -137,7 +137,7 @@ module Appstats
|
|
137
137
|
|
138
138
|
it "should look similar to regular entry" do
|
139
139
|
Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")
|
140
|
-
Appstats::Logger.raw_read.should == ["0.17.
|
140
|
+
Appstats::Logger.raw_read.should == ["0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
|
141
141
|
end
|
142
142
|
|
143
143
|
end
|
@@ -154,47 +154,47 @@ module Appstats
|
|
154
154
|
|
155
155
|
it "should handle a statistics entry" do
|
156
156
|
expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
|
157
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
157
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
158
158
|
actual.should == expected
|
159
159
|
end
|
160
160
|
|
161
161
|
it "should handle contexts" do
|
162
162
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
163
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
163
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
164
164
|
actual.should == expected
|
165
165
|
end
|
166
166
|
|
167
167
|
it "should handle multiple actions" do
|
168
168
|
expected = { :action => ["address_filter", "blah"], :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
169
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
169
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
|
170
170
|
actual.should == expected
|
171
171
|
end
|
172
172
|
|
173
173
|
it "should handle multiple of same context" do
|
174
174
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => ['Sin','Market'] }
|
175
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
175
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
|
176
176
|
actual.should == expected
|
177
177
|
end
|
178
178
|
|
179
179
|
it "should handle no actions" do
|
180
180
|
expected = { :action => "UNKNOWN_ACTION", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
181
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
181
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
|
182
182
|
actual.should == expected
|
183
183
|
end
|
184
184
|
|
185
185
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
186
186
|
expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
|
187
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
187
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
|
188
188
|
actual.should == expected
|
189
189
|
|
190
190
|
expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
|
191
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
191
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
|
192
192
|
actual.should == expected
|
193
193
|
end
|
194
194
|
|
195
195
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
196
196
|
expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
|
197
|
-
actual = Appstats::Logger.entry_to_hash("0.17.
|
197
|
+
actual = Appstats::Logger.entry_to_hash("0.17.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
|
198
198
|
actual.should == expected
|
199
199
|
end
|
200
200
|
|
@@ -203,66 +203,66 @@ module Appstats
|
|
203
203
|
describe "#entry_to_s" do
|
204
204
|
|
205
205
|
it "should handle a statistics entry" do
|
206
|
-
expected = "0.17.
|
206
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
207
207
|
actual = Appstats::Logger.entry_to_s("address_search")
|
208
208
|
actual.should == expected
|
209
209
|
end
|
210
210
|
|
211
211
|
it "should handle numbers" do
|
212
|
-
expected = "0.17.
|
212
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
|
213
213
|
actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
|
214
214
|
actual.should == expected
|
215
215
|
end
|
216
216
|
|
217
217
|
it "should handle default contexts" do
|
218
218
|
Appstats::Logger.default_contexts[:app_name] = "market"
|
219
|
-
expected = "0.17.
|
219
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
|
220
220
|
actual = Appstats::Logger.entry_to_s("address_search")
|
221
221
|
actual.should == expected
|
222
222
|
end
|
223
223
|
|
224
224
|
it "should handle contexts (and sort them by symbol)" do
|
225
|
-
expected = "0.17.
|
225
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
226
226
|
actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
|
227
227
|
actual.should == expected
|
228
228
|
end
|
229
229
|
|
230
230
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
231
|
-
expected = "0.17.
|
231
|
+
expected = "0.17.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
|
232
232
|
actual = Appstats::Logger.entry_to_s("address:=search-n")
|
233
233
|
actual.should == expected
|
234
234
|
|
235
|
-
expected = "0.17.
|
235
|
+
expected = "0.17.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
|
236
236
|
actual = Appstats::Logger.entry_to_s("address::search==--n")
|
237
237
|
actual.should == expected
|
238
238
|
end
|
239
239
|
|
240
240
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
241
|
-
expected = "0.17.
|
241
|
+
expected = "0.17.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
|
242
242
|
actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
|
243
243
|
actual.should == expected
|
244
244
|
end
|
245
245
|
|
246
246
|
it "should ignore spaces" do
|
247
|
-
expected = "0.17.
|
247
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
|
248
248
|
actual = Appstats::Logger.entry_to_s("address search")
|
249
249
|
actual.should == expected
|
250
250
|
end
|
251
251
|
|
252
252
|
it "should convert newlines in action" do
|
253
|
-
expected = "0.17.
|
253
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
|
254
254
|
actual = Appstats::Logger.entry_to_s("address_\nsearch")
|
255
255
|
actual.should == expected
|
256
256
|
end
|
257
257
|
|
258
258
|
it "should convert newlines in context" do
|
259
|
-
expected = "0.17.
|
259
|
+
expected = "0.17.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
|
260
260
|
actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
|
261
261
|
actual.should == expected
|
262
262
|
end
|
263
263
|
|
264
264
|
it "should convert newlines based on the delimiter" do
|
265
|
-
expected = "0.17.
|
265
|
+
expected = "0.17.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
|
266
266
|
actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
|
267
267
|
actual.should == expected
|
268
268
|
end
|
data/spec/result_job_spec.rb
CHANGED
@@ -258,6 +258,35 @@ module Appstats
|
|
258
258
|
|
259
259
|
end
|
260
260
|
|
261
|
+
describe "#require_third_party_queries" do
|
262
|
+
|
263
|
+
|
264
|
+
it "should ignore invalid input" do
|
265
|
+
Appstats.should_receive(:log).with(:info, "Please specify the third party query ':path'.")
|
266
|
+
Appstats::ResultJob.require_third_party_queries([ { :blah => '/does/not/exist.rb'} ])
|
267
|
+
end
|
268
|
+
|
269
|
+
it "should ignore nill input" do
|
270
|
+
Appstats.should_receive(:log).with(:info, "No third party query provided.")
|
271
|
+
Appstats::ResultJob.require_third_party_queries(nil)
|
272
|
+
end
|
273
|
+
|
274
|
+
it "should ignore invalid files" do
|
275
|
+
File.exists?('/does/not/exist.rb').should == false
|
276
|
+
Appstats.should_receive(:log).with(:info, "Unable to find third party query [/does/not/exist.rb].")
|
277
|
+
Appstats::ResultJob.require_third_party_queries([ { :path => '/does/not/exist.rb'} ])
|
278
|
+
end
|
279
|
+
|
280
|
+
it "should load the file" do
|
281
|
+
Object::const_defined?('UnloadedQuery').should == false
|
282
|
+
Appstats.should_receive(:log).with(:info, "Loaded to third party query [#{File.dirname(__FILE__)}/../lib/appstats/test_unloaded_query.rb].")
|
283
|
+
Appstats::ResultJob.require_third_party_queries([ { :path => "#{File.dirname(__FILE__)}/../lib/appstats/test_unloaded_query.rb"} ])
|
284
|
+
Object::const_defined?('UnloadedQuery').should == true
|
285
|
+
end
|
286
|
+
|
287
|
+
end
|
288
|
+
|
289
|
+
|
261
290
|
describe "#run" do
|
262
291
|
|
263
292
|
before(:each) do
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: appstats
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 93
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 17
|
9
|
-
-
|
10
|
-
version: 0.17.
|
9
|
+
- 3
|
10
|
+
version: 0.17.3
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrew Forward
|
@@ -202,6 +202,7 @@ files:
|
|
202
202
|
- lib/appstats/tasks.rb
|
203
203
|
- lib/appstats/test_object.rb
|
204
204
|
- lib/appstats/test_query.rb
|
205
|
+
- lib/appstats/test_unloaded_query.rb
|
205
206
|
- lib/appstats/version.rb
|
206
207
|
- lib/daemons/appstats_log_collector.rb
|
207
208
|
- lib/daemons/appstats_log_collector_ctl
|