rsconn 0.0.4 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rsconn.rb +14 -0
- data/lib/rsconn/postgres.rb +4 -4
- data/lib/rsconn/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: dc857d2d01dfe4a2dc3702d882332f5903d55b44
|
|
4
|
+
data.tar.gz: 8d824aad58156fb5e552454a51bb11d467d5c558
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3ef0977b1251748b159f27a27204b73cc2485ee87e28be0c185e758d0d49d071c9724b3f01c81f10600adc9fee6914a2a866a0a07728d94c7834f917f16d83b1
|
|
7
|
+
data.tar.gz: 20e9d5322b83b7acb7017c529ff5175b85c5e49e324623d916457d5f438d245424811e3bf908c53e26a755942fd6194574d59d18d8d9667ed9e295bc4729d7c6
|
data/lib/rsconn.rb
CHANGED
|
@@ -21,5 +21,19 @@ module Rsconn
|
|
|
21
21
|
def set_query_slot_count(count)
|
|
22
22
|
execute("SET wlm_query_slot_count TO #{count};")
|
|
23
23
|
end
|
|
24
|
+
|
|
25
|
+
private
|
|
26
|
+
|
|
27
|
+
def recoverable_error?(err_msg)
|
|
28
|
+
!!(err_msg =~ /vacuum is running/i) || super
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
def sleep_time_for_error(err_msg)
|
|
32
|
+
if err_msg =~ /vacuum is running/i
|
|
33
|
+
300
|
|
34
|
+
else
|
|
35
|
+
super
|
|
36
|
+
end
|
|
37
|
+
end
|
|
24
38
|
end
|
|
25
39
|
end
|
data/lib/rsconn/postgres.rb
CHANGED
|
@@ -124,10 +124,10 @@ module Rsconn
|
|
|
124
124
|
return_value
|
|
125
125
|
|
|
126
126
|
rescue PG::Error => e
|
|
127
|
-
if recoverable_error?(e) && @retry_count < @max_retries
|
|
127
|
+
if recoverable_error?(e.message) && @retry_count < @max_retries
|
|
128
128
|
@retry_count += 1
|
|
129
|
-
sleep_time = sleep_time_for_error(e)
|
|
130
|
-
log "Failed with recoverable error (#{e.class}): #{e}"
|
|
129
|
+
sleep_time = sleep_time_for_error(e.message)
|
|
130
|
+
log "Failed with recoverable error (#{e.class}): #{e.message}"
|
|
131
131
|
log "Retry attempt #{@retry_count} will occur after #{sleep_time} seconds"
|
|
132
132
|
sleep sleep_time
|
|
133
133
|
retry
|
|
@@ -135,7 +135,7 @@ module Rsconn
|
|
|
135
135
|
else
|
|
136
136
|
@retry_count = 0
|
|
137
137
|
@error_occurred = true
|
|
138
|
-
log "An error occurred (#{e.class}): #{e}"
|
|
138
|
+
log "An error occurred (#{e.class}): #{e.message}"
|
|
139
139
|
log e.backtrace.join("\n")
|
|
140
140
|
|
|
141
141
|
raise e if @abort_on_error
|
data/lib/rsconn/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rsconn
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dean Morin
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-12-
|
|
11
|
+
date: 2014-12-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|