wagn 1.15.4 → 1.15.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/rails/controllers/card_controller.rb +23 -5
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 858dc87fd7e13cc814c1e3def48c601e74cb25ac
|
|
4
|
+
data.tar.gz: f836289378150a2dccd835b8ba3dbdca945d40fb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 681c3ed8b0d5ed95e3683df80ed1adfa6be9d6d58435df91f7bfe3ed7cbdfcfe93332fbc91e61f69f4e0da2a73c14ccbaba6d67bb121cfcb8b0b66934714c6f5
|
|
7
|
+
data.tar.gz: 86589d7f3eb034090761fb96aeb626606948a82ef7d19a0f000401f32f876a9d95b51ad5f0dce6e9eb2f3002c69093dc96ba45a71a7142c75f2cd9dd8c01b154
|
|
@@ -11,9 +11,9 @@ class CardController < ActionController::Base
|
|
|
11
11
|
include Card::HtmlFormat::Location
|
|
12
12
|
include Recaptcha::Verify
|
|
13
13
|
|
|
14
|
-
before_filter :start_performance_logger
|
|
15
|
-
after_filter :stop_performance_logger
|
|
16
|
-
after_filter
|
|
14
|
+
before_filter :start_performance_logger
|
|
15
|
+
after_filter :stop_performance_logger
|
|
16
|
+
after_filter :request_logger if Wagn.config.request_logger
|
|
17
17
|
|
|
18
18
|
before_filter :per_request_setup, :except => [:asset]
|
|
19
19
|
before_filter :load_id, :only => [ :read ]
|
|
@@ -135,11 +135,29 @@ class CardController < ActionController::Base
|
|
|
135
135
|
end
|
|
136
136
|
|
|
137
137
|
def start_performance_logger
|
|
138
|
-
|
|
138
|
+
if params[:performance_log]
|
|
139
|
+
@old_log_level = Wagn.config.log_level
|
|
140
|
+
if params[:performance_log].kind_of?(Hash) && params[:performance_log][:output] == 'console'
|
|
141
|
+
Wagn.config.log_level = :wagn
|
|
142
|
+
end
|
|
143
|
+
Card::Log::Performance.load_config params[:performance_log]
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
if Wagn.config.performance_logger || params[:performance_log]
|
|
147
|
+
Card::Log::Performance.start :method=>env["REQUEST_METHOD"], :message=>env["PATH_INFO"]
|
|
148
|
+
end
|
|
139
149
|
end
|
|
140
150
|
|
|
141
151
|
def stop_performance_logger
|
|
142
|
-
|
|
152
|
+
if Wagn.config.performance_logger || params[:performance_log]
|
|
153
|
+
Card::Log::Performance.stop
|
|
154
|
+
end
|
|
155
|
+
if params[:perfomance_log]
|
|
156
|
+
Wagn.config.log_level = @old_log_level
|
|
157
|
+
if Wagn.config.performance_logger
|
|
158
|
+
Card::Log::Performance.load_config Wagn.config.performance_logger
|
|
159
|
+
end
|
|
160
|
+
end
|
|
143
161
|
end
|
|
144
162
|
|
|
145
163
|
protected
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: wagn
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.15.
|
|
4
|
+
version: 1.15.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ethan McCutchen
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date: 2015-06-
|
|
14
|
+
date: 2015-06-10 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: rails
|
|
@@ -33,14 +33,14 @@ dependencies:
|
|
|
33
33
|
requirements:
|
|
34
34
|
- - '='
|
|
35
35
|
- !ruby/object:Gem::Version
|
|
36
|
-
version: 1.15.
|
|
36
|
+
version: 1.15.5
|
|
37
37
|
type: :runtime
|
|
38
38
|
prerelease: false
|
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
40
40
|
requirements:
|
|
41
41
|
- - '='
|
|
42
42
|
- !ruby/object:Gem::Version
|
|
43
|
-
version: 1.15.
|
|
43
|
+
version: 1.15.5
|
|
44
44
|
description: a wiki approach to stuctured data, dynamic interaction, and web design
|
|
45
45
|
email:
|
|
46
46
|
- info@wagn.org
|