fly.io-rails 0.1.18-x86_64-darwin → 0.1.19-x86_64-darwin
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fly.io-rails/actions.rb +16 -8
- data/lib/fly.io-rails/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 64e4378a88765ff053d5971a67090b7be6d73748e6392e9ad046ffd40763de3e
|
4
|
+
data.tar.gz: 3c5c03dd9063381849995990c8f626c653744c29b2318d9e0f21be1a5e28ed50
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f4acf517f636845df6a3d41663eac4ee2f5e3051b91a64be4206ac3e694d62afa8ea5a73d572da60d3aab08f75af4b8805e3bda0f39df7049661b0d62e795ab6
|
7
|
+
data.tar.gz: 32f3aff5af96d2fd9c9d91ff58102b1ceac0800c422ab517d748a13e7139d1d684bb6a9e1b1e10512accf2269ee7f2521edf34cb26b761e42af5927a5d2da82d
|
data/lib/fly.io-rails/actions.rb
CHANGED
@@ -365,13 +365,15 @@ module Fly
|
|
365
365
|
|
366
366
|
# stop previous instances - list will fail on first run
|
367
367
|
stdout, stderr, status = Open3.capture3('fly machines list --json')
|
368
|
+
existing_machines = []
|
368
369
|
unless stdout.empty?
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
370
|
+
JSON.parse(stdout).each do |list|
|
371
|
+
existing_machines << list['name']
|
372
|
+
next if list['id'] == machine or list['state'] == 'destroyed'
|
373
|
+
cmd = "fly machines remove --force #{list['id']}"
|
374
|
+
say_status :run, cmd
|
375
|
+
system cmd
|
376
|
+
end
|
375
377
|
end
|
376
378
|
|
377
379
|
# configure sqlite3 (can be overridden by fly.toml)
|
@@ -410,7 +412,10 @@ module Fly
|
|
410
412
|
options = {region: @region, config: config}
|
411
413
|
say_status :fly, "start #{app}"
|
412
414
|
if not toml['processes'] or toml['processes'].empty?
|
413
|
-
options[:name] = "#{app}-machine"
|
415
|
+
options[:name] = "#{app}-machine"
|
416
|
+
taken = existing_machines.find {|name| name.start_with? options[:name]}
|
417
|
+
options[:name] = taken == options[:name] ? "#{taken}-2" : taken.next if taken
|
418
|
+
|
414
419
|
start = Fly::Machines.create_and_start_machine(app, options)
|
415
420
|
machines['app'] = start[:id]
|
416
421
|
else
|
@@ -418,11 +423,14 @@ module Fly
|
|
418
423
|
config[:env]['NATS_SERVER'] = 'localhost'
|
419
424
|
toml['processes'].each do |name, entrypoint|
|
420
425
|
options[:name] = "#{app}-machine-#{name}"
|
426
|
+
taken = existing_machines.find {|name| name.start_with? options[:name]}
|
427
|
+
options[:name] = taken == options[:name] ? "#{taken}-2" : taken.next if taken
|
428
|
+
|
421
429
|
config[:env]['SERVER_COMMAND'] = entrypoint
|
422
430
|
start = Fly::Machines.create_and_start_machine(app, options)
|
423
431
|
|
424
432
|
if start['error']
|
425
|
-
STDERR.puts "ERROR: #{start
|
433
|
+
STDERR.puts "ERROR: #{start['error']}"
|
426
434
|
exit 1
|
427
435
|
end
|
428
436
|
|
data/lib/fly.io-rails/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fly.io-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.19
|
5
5
|
platform: x86_64-darwin
|
6
6
|
authors:
|
7
7
|
- Sam Ruby
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-10-
|
11
|
+
date: 2022-10-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fly-ruby
|