move RTurk setup to an initializer

Andrew Cantino %!s(int64=11) %!d(string=hace) años
padre
commit
82156f3c75
Se han modificado 2 ficheros con 4 adiciones y 9 borrados
  1. 0 9
      app/models/agents/human_task_agent.rb
  2. 4 0
      config/initializers/aws.rb

+ 0 - 9
app/models/agents/human_task_agent.rb

@@ -144,7 +144,6 @@ module Agents
144 144
     end
145 145
 
146 146
     def check
147
-      setup!
148 147
       review_hits
149 148
 
150 149
       if options[:trigger_on] == "schedule" && (memory[:last_schedule] || 0) <= Time.now.to_i - options[:submission_period].to_i * 60 * 60
@@ -155,20 +154,12 @@ module Agents
155 154
 
156 155
     def receive(incoming_events)
157 156
       if options[:trigger_on] == "event"
158
-        setup!
159
-
160 157
         incoming_events.each do |event|
161 158
           create_hit event
162 159
         end
163 160
       end
164 161
     end
165 162
 
166
-    # To be moved either into an initilizer or a per-agent setting.
167
-    def setup!
168
-      RTurk::logger.level = Logger::DEBUG
169
-      RTurk.setup(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_ACCESS_KEY'], :sandbox => ENV['AWS_SANDBOX'] == "true") unless Rails.env.test?
170
-    end
171
-
172 163
     protected
173 164
 
174 165
     def review_hits

+ 4 - 0
config/initializers/aws.rb

@@ -0,0 +1,4 @@
1
+unless Rails.env.test?
2
+  RTurk::logger.level = Logger::DEBUG
3
+  RTurk.setup(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_ACCESS_KEY'], :sandbox => ENV['AWS_SANDBOX'] == "true")
4
+end