appstats 0.11.2 → 0.11.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +1 -1
- data/lib/appstats/log_collector.rb +18 -7
- data/lib/appstats/version.rb +1 -1
- data/spec/entry_spec.rb +4 -4
- data/spec/log_collector_spec.rb +2 -2
- data/spec/logger_spec.rb +18 -18
- metadata +3 -3
data/Gemfile.lock
CHANGED
@@ -69,10 +69,7 @@ module Appstats
|
|
69
69
|
return 0
|
70
70
|
end
|
71
71
|
|
72
|
-
normalized_logins =
|
73
|
-
raw_logins.each do |login|
|
74
|
-
normalized_logins[login[:host]] = login
|
75
|
-
end
|
72
|
+
normalized_logins = normalize_logins(raw_logins)
|
76
73
|
count = 0
|
77
74
|
|
78
75
|
Appstats.log(:info,"About to download #{all.size} file(s).")
|
@@ -134,19 +131,25 @@ module Appstats
|
|
134
131
|
count
|
135
132
|
end
|
136
133
|
|
137
|
-
def self.remove_remote_files(
|
134
|
+
def self.remove_remote_files(raw_logins)
|
138
135
|
all = LogCollector.where("status = 'processed'").all
|
139
136
|
if all.empty?
|
140
137
|
Appstats.log(:info,"No remote logs to remove.")
|
141
138
|
return 0
|
142
139
|
end
|
143
140
|
|
141
|
+
normalized_logins = normalize_logins(raw_logins)
|
142
|
+
|
144
143
|
count = 0
|
145
144
|
Appstats.log(:info,"About to remove #{all.size} remote file(s) from the processing queue.")
|
146
145
|
all.each do |log_collector|
|
147
|
-
|
146
|
+
host = log_collector.host
|
147
|
+
user = normalized_logins[host][:user]
|
148
|
+
password = normalized_logins[host][:password]
|
149
|
+
|
150
|
+
Net::SSH.start(host, user, :password => password ) do |ssh|
|
148
151
|
ssh.exec!("mv #{log_collector.filename} #{log_collector.processed_filename}")
|
149
|
-
Appstats.log(:info," - #{
|
152
|
+
Appstats.log(:info," - #{user}@#{host}:#{log_collector.processed_filename}")
|
150
153
|
log_collector.status = "destroyed"
|
151
154
|
log_collector.save
|
152
155
|
count += 1
|
@@ -155,6 +158,14 @@ module Appstats
|
|
155
158
|
Appstats.log(:info,"Removed #{count} remote file(s).")
|
156
159
|
count
|
157
160
|
end
|
161
|
+
|
162
|
+
def self.normalize_logins(raw_logins)
|
163
|
+
normalized_logins = {}
|
164
|
+
raw_logins.each do |login|
|
165
|
+
normalized_logins[login[:host]] = login
|
166
|
+
end
|
167
|
+
normalized_logins
|
168
|
+
end
|
158
169
|
|
159
170
|
end
|
160
171
|
end
|
data/lib/appstats/version.rb
CHANGED
data/spec/entry_spec.rb
CHANGED
@@ -188,18 +188,18 @@ module Appstats
|
|
188
188
|
end
|
189
189
|
|
190
190
|
it "should understand an entry without contexts" do
|
191
|
-
entry = Entry.create_from_logger_string("0.11.
|
191
|
+
entry = Entry.create_from_logger_string("0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
192
192
|
Entry.count.should == @before_count + 1
|
193
193
|
entry.action.should == "address_search"
|
194
|
-
entry.raw_entry.should == "0.11.
|
194
|
+
entry.raw_entry.should == "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
195
195
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
196
196
|
end
|
197
197
|
|
198
198
|
it "should understand contexts" do
|
199
|
-
entry = Entry.create_from_logger_string("0.11.
|
199
|
+
entry = Entry.create_from_logger_string("0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
200
200
|
Entry.count.should == @before_count + 1
|
201
201
|
entry.action.should == "address_filter"
|
202
|
-
entry.raw_entry.should == "0.11.
|
202
|
+
entry.raw_entry.should == "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
203
203
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
204
204
|
entry.contexts.size.should == 2
|
205
205
|
entry.contexts[0].context_key = "app_name"
|
data/spec/log_collector_spec.rb
CHANGED
@@ -324,7 +324,7 @@ module Appstats
|
|
324
324
|
it "should ignored non processed files" do
|
325
325
|
log = LogCollector.create(:status => "blah")
|
326
326
|
Appstats.should_receive(:log).with(:info,"No remote logs to remove.")
|
327
|
-
Appstats::LogCollector.remove_remote_files(@
|
327
|
+
Appstats::LogCollector.remove_remote_files(@logins).should == 0
|
328
328
|
end
|
329
329
|
|
330
330
|
it "should log all transactions" do
|
@@ -342,7 +342,7 @@ module Appstats
|
|
342
342
|
Appstats.should_receive(:log).with(:info, " - deployer@myhost.localnet:/my/path/log/__processed__mystats_2011-01-03.log")
|
343
343
|
Appstats.should_receive(:log).with(:info, "Removed 2 remote file(s).")
|
344
344
|
|
345
|
-
Appstats::LogCollector.remove_remote_files(@
|
345
|
+
Appstats::LogCollector.remove_remote_files(@logins).should == 2
|
346
346
|
log1.reload and log2.reload
|
347
347
|
log1.status.should == "destroyed"
|
348
348
|
log2.status.should == "destroyed"
|
data/spec/logger_spec.rb
CHANGED
@@ -115,7 +115,7 @@ module Appstats
|
|
115
115
|
|
116
116
|
it "should accept numbers" do
|
117
117
|
Appstats::Logger.entry(5, :blah => 6)
|
118
|
-
Appstats::Logger.raw_read.should == ["0.11.
|
118
|
+
Appstats::Logger.raw_read.should == ["0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
|
119
119
|
end
|
120
120
|
|
121
121
|
end
|
@@ -124,7 +124,7 @@ module Appstats
|
|
124
124
|
|
125
125
|
it "should look similar to regular entry" do
|
126
126
|
Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")
|
127
|
-
Appstats::Logger.raw_read.should == ["0.11.
|
127
|
+
Appstats::Logger.raw_read.should == ["0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
|
128
128
|
end
|
129
129
|
|
130
130
|
end
|
@@ -141,29 +141,29 @@ module Appstats
|
|
141
141
|
|
142
142
|
it "should handle a statistics entry" do
|
143
143
|
expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
|
144
|
-
actual = Appstats::Logger.entry_to_hash("0.11.
|
144
|
+
actual = Appstats::Logger.entry_to_hash("0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
145
145
|
actual.should == expected
|
146
146
|
end
|
147
147
|
|
148
148
|
it "should handle contexts" do
|
149
149
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
150
|
-
actual = Appstats::Logger.entry_to_hash("0.11.
|
150
|
+
actual = Appstats::Logger.entry_to_hash("0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
151
151
|
actual.should == expected
|
152
152
|
end
|
153
153
|
|
154
154
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
155
155
|
expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
|
156
|
-
actual = Appstats::Logger.entry_to_hash("0.11.
|
156
|
+
actual = Appstats::Logger.entry_to_hash("0.11.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
|
157
157
|
actual.should == expected
|
158
158
|
|
159
159
|
expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
|
160
|
-
actual = Appstats::Logger.entry_to_hash("0.11.
|
160
|
+
actual = Appstats::Logger.entry_to_hash("0.11.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
|
161
161
|
actual.should == expected
|
162
162
|
end
|
163
163
|
|
164
164
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
165
165
|
expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
|
166
|
-
actual = Appstats::Logger.entry_to_hash("0.11.
|
166
|
+
actual = Appstats::Logger.entry_to_hash("0.11.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
|
167
167
|
actual.should == expected
|
168
168
|
end
|
169
169
|
|
@@ -172,66 +172,66 @@ module Appstats
|
|
172
172
|
describe "#entry_to_s" do
|
173
173
|
|
174
174
|
it "should handle a statistics entry" do
|
175
|
-
expected = "0.11.
|
175
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
176
176
|
actual = Appstats::Logger.entry_to_s("address_search")
|
177
177
|
actual.should == expected
|
178
178
|
end
|
179
179
|
|
180
180
|
it "should handle numbers" do
|
181
|
-
expected = "0.11.
|
181
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
|
182
182
|
actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
|
183
183
|
actual.should == expected
|
184
184
|
end
|
185
185
|
|
186
186
|
it "should handle default contexts" do
|
187
187
|
Appstats::Logger.default_contexts[:app_name] = "market"
|
188
|
-
expected = "0.11.
|
188
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
|
189
189
|
actual = Appstats::Logger.entry_to_s("address_search")
|
190
190
|
actual.should == expected
|
191
191
|
end
|
192
192
|
|
193
193
|
it "should handle contexts (and sort them by symbol)" do
|
194
|
-
expected = "0.11.
|
194
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
195
195
|
actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
|
196
196
|
actual.should == expected
|
197
197
|
end
|
198
198
|
|
199
199
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
200
|
-
expected = "0.11.
|
200
|
+
expected = "0.11.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
|
201
201
|
actual = Appstats::Logger.entry_to_s("address:=search-n")
|
202
202
|
actual.should == expected
|
203
203
|
|
204
|
-
expected = "0.11.
|
204
|
+
expected = "0.11.3 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
|
205
205
|
actual = Appstats::Logger.entry_to_s("address::search==--n")
|
206
206
|
actual.should == expected
|
207
207
|
end
|
208
208
|
|
209
209
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
210
|
-
expected = "0.11.
|
210
|
+
expected = "0.11.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
|
211
211
|
actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
|
212
212
|
actual.should == expected
|
213
213
|
end
|
214
214
|
|
215
215
|
it "should ignore spaces" do
|
216
|
-
expected = "0.11.
|
216
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
|
217
217
|
actual = Appstats::Logger.entry_to_s("address search")
|
218
218
|
actual.should == expected
|
219
219
|
end
|
220
220
|
|
221
221
|
it "should convert newlines in action" do
|
222
|
-
expected = "0.11.
|
222
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
|
223
223
|
actual = Appstats::Logger.entry_to_s("address_\nsearch")
|
224
224
|
actual.should == expected
|
225
225
|
end
|
226
226
|
|
227
227
|
it "should convert newlines in context" do
|
228
|
-
expected = "0.11.
|
228
|
+
expected = "0.11.3 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
|
229
229
|
actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
|
230
230
|
actual.should == expected
|
231
231
|
end
|
232
232
|
|
233
233
|
it "should convert newlines based on the delimiter" do
|
234
|
-
expected = "0.11.
|
234
|
+
expected = "0.11.3 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
|
235
235
|
actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
|
236
236
|
actual.should == expected
|
237
237
|
end
|
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: 53
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 11
|
9
|
-
-
|
10
|
-
version: 0.11.
|
9
|
+
- 3
|
10
|
+
version: 0.11.3
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrew Forward
|