hotswap 0.2.1 → 0.2.2
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/hotswap/database.rb +2 -0
- data/lib/hotswap/middleware.rb +13 -1
- data/lib/hotswap/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ed51ade37bb88b93a99e766a91cd1148255e6abb36f723977131b9d6419271fd
|
|
4
|
+
data.tar.gz: 5bac1bb9a48fe4c93cf950685a98792c809a4260f7efd9a824e22b3d0d1ca69e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 19f1b83864b37d2099a313bf38d051a93d3d73cf85f5657e74b31664c694937440b6b8076b49369057d0412b1f4e0580aa37b4979ceeb91b41a66ba02294fc62
|
|
7
|
+
data.tar.gz: 33b9108f537b578e5ff1fcf396ff61ba3e23ab23000ed28f1128515c83c05d17fe78f4f4141acd5f63800c64b72d61312bfcfb2d605a20336567df879006a9b5
|
data/lib/hotswap/database.rb
CHANGED
|
@@ -37,6 +37,7 @@ module Hotswap
|
|
|
37
37
|
stderr.write("Swapping database...\n")
|
|
38
38
|
|
|
39
39
|
Middleware::SWAP_LOCK.synchronize do
|
|
40
|
+
logger.info "swap lock acquired, requests are queued"
|
|
40
41
|
if defined?(ActiveRecord::Base)
|
|
41
42
|
ActiveRecord::Base.connection_handler.clear_all_connections!
|
|
42
43
|
logger.info "disconnected ActiveRecord"
|
|
@@ -44,6 +45,7 @@ module Hotswap
|
|
|
44
45
|
File.rename(temp.path, @path)
|
|
45
46
|
logger.info "renamed #{temp.path} → #{@path}"
|
|
46
47
|
end
|
|
48
|
+
logger.info "swap lock released, requests resuming"
|
|
47
49
|
|
|
48
50
|
if defined?(ActiveRecord::Base)
|
|
49
51
|
ActiveRecord::Base.establish_connection
|
data/lib/hotswap/middleware.rb
CHANGED
|
@@ -7,7 +7,19 @@ module Hotswap
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def call(env)
|
|
10
|
-
SWAP_LOCK.
|
|
10
|
+
if SWAP_LOCK.locked?
|
|
11
|
+
logger.info "request queued, waiting for swap to complete: #{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
|
|
12
|
+
SWAP_LOCK.synchronize do
|
|
13
|
+
logger.info "swap complete, resuming request: #{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
|
|
14
|
+
@app.call(env)
|
|
15
|
+
end
|
|
16
|
+
else
|
|
17
|
+
SWAP_LOCK.synchronize { @app.call(env) }
|
|
18
|
+
end
|
|
11
19
|
end
|
|
20
|
+
|
|
21
|
+
private
|
|
22
|
+
|
|
23
|
+
def logger = Hotswap.logger
|
|
12
24
|
end
|
|
13
25
|
end
|
data/lib/hotswap/version.rb
CHANGED