fk-redis-sqspoller 0.1.2.5.7 → 0.1.2.5.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/example_config.yml +0 -3
- data/lib/sqspoller/sqs_poller.rb +9 -30
- data/lib/sqspoller/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e0e92e9a52260863c748a9cad310da796f8f6fde
|
4
|
+
data.tar.gz: 10eebb3ff570277f5c0fa3aa1b03cbd20dc7539a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 829efb6fd1df2c31b3677fb7297e2657f74a9b9b521697a3ca79fbd27a98ba8a93736c5a5a6fe123c75d6248f76f845e00cc508332231c3c0fe317c25012b143
|
7
|
+
data.tar.gz: 03b3953eb5a384405d70987b6519200948cb0d817fb93dcfae47d7013cedad9d4d023e9732edd05df1096dff0e8b2cd0d9af9be0b884b54feb1e61aa96989e11
|
data/example_config.yml
CHANGED
@@ -7,9 +7,6 @@ worker_configuration:
|
|
7
7
|
staging-queues:
|
8
8
|
staging-outbound-messages_company-name-1:
|
9
9
|
polling_threads: 1
|
10
|
-
staging-outbound-messages_company-shadow-queue-name-1:
|
11
|
-
polling_threads: 1
|
12
|
-
sns_topic_arn: "arn:aws:sns:us-east-1:723008196684:blackhole"
|
13
10
|
staging-outbound-messages_company-name-2:
|
14
11
|
polling_threads: 1
|
15
12
|
staging-outbound-messages_company-name-3:
|
data/lib/sqspoller/sqs_poller.rb
CHANGED
@@ -99,26 +99,14 @@ module Sqspoller
|
|
99
99
|
end
|
100
100
|
|
101
101
|
def start_queues_with_config poller_args
|
102
|
-
@
|
103
|
-
@logger = Logger.new(@logger_file)
|
104
|
-
poller_args[:logger_file] = @logger_file
|
102
|
+
@logger = Logger.new(poller_args[:log_filename])
|
105
103
|
poller_args[:logger] = @logger
|
106
104
|
@logger.info "Starting version: #{VERSION}"
|
107
105
|
@logger.info "Get config"
|
108
106
|
config = if poller_args[:redis_or_file]
|
109
|
-
|
110
|
-
load_config_from_redis poller_args[:content_name]
|
111
|
-
rescue
|
112
|
-
@logger.error "Unable to load config from Redis key #{poller_args[:content_name]}"
|
113
|
-
{}
|
114
|
-
end
|
107
|
+
load_config_from_redis poller_args[:content_name]
|
115
108
|
else
|
116
|
-
|
117
|
-
load_config_from_file poller_args[:content_name]
|
118
|
-
rescue
|
119
|
-
@logger.error "Unable to load config from file named #{poller_args[:content_name]}"
|
120
|
-
{}
|
121
|
-
end
|
109
|
+
load_config_from_file poller_args[:content_name]
|
122
110
|
end
|
123
111
|
@logger.info "Config: #{config.inspect}"
|
124
112
|
queues_config = config[poller_args[:queue_config_name]]
|
@@ -130,22 +118,16 @@ module Sqspoller
|
|
130
118
|
|
131
119
|
@logger.info "Started poller method"
|
132
120
|
|
133
|
-
|
134
|
-
total_poller_threads = worker_pool_init worker_config, queues_config, poller_args[:log_filename]
|
135
|
-
|
136
|
-
# keep track of default delegator and queue specific delegators
|
137
|
-
@delegator = {}
|
138
|
-
@delegator.default = initialize_worker worker_config, total_poller_threads, @logger_file
|
121
|
+
message_delegator = worker_pool_init config[:worker_configuration].merge(poller_args), queues_config, poller_args[:log_filename]
|
139
122
|
|
140
123
|
if poller_args[:redis_or_file]
|
141
|
-
|
142
|
-
start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval, worker_config, total_poller_threads
|
124
|
+
start_all_queues_with_refresh queues_config, message_delegator, poller_args, config[:worker_configuration][:refresh_interval_in_seconds] || 3600
|
143
125
|
else
|
144
126
|
start_all_queues queues_config, message_delegator, poller_args
|
145
127
|
end
|
146
128
|
end
|
147
129
|
|
148
|
-
def start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval
|
130
|
+
def start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval
|
149
131
|
@logger.info "Start all queues with refresh"
|
150
132
|
queues = {}
|
151
133
|
loop do
|
@@ -157,14 +139,10 @@ module Sqspoller
|
|
157
139
|
@logger.info " Queue: #{queue} not created, already initialized and running"
|
158
140
|
else
|
159
141
|
@logger.info " Queue: #{queue} previously created, however not all threads are running. Restarting."
|
160
|
-
queues[queue] = start_queue_controller queues_config, queue,
|
142
|
+
queues[queue] = start_queue_controller queues_config, queue, message_delegator, poller_args
|
161
143
|
end
|
162
144
|
else
|
163
|
-
|
164
|
-
worker_config['sns_topic_arn'] = queues_config['sns_topic_arn']
|
165
|
-
@delegator['queue'] = initialize_worker worker_config, @total_poller_threads, @logger_file
|
166
|
-
end
|
167
|
-
queues[queue] = start_queue_controller queues_config, queue, @delegator['queue'], poller_args
|
145
|
+
queues[queue] = start_queue_controller queues_config, queue, message_delegator, poller_args
|
168
146
|
end
|
169
147
|
end
|
170
148
|
@logger.info " Done creating queues, sleeping for #{refresh_interval} seconds"
|
@@ -187,6 +165,7 @@ module Sqspoller
|
|
187
165
|
total_poller_threads = queues_config.keys.reduce(0) do |sum, queue|
|
188
166
|
sum += queues_config[queue][:polling_threads]
|
189
167
|
end
|
168
|
+
initialize_worker worker_config, total_poller_threads, logger_file
|
190
169
|
end
|
191
170
|
|
192
171
|
def start_queue_controller queues_config, queue, message_delegator, poller_args
|
data/lib/sqspoller/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fk-redis-sqspoller
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.2.5.
|
4
|
+
version: 0.1.2.5.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- FourKites
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-11-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|