dory 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d01151c6c0776bde1a7aadf38029c8764585d88d
-  data.tar.gz: 50a86e3abb55c96ddb3878162aa31baf8fb90197
+  metadata.gz: ed21af67680e2286c0717b5b33de9f296b2664ce
+  data.tar.gz: 6b93398f6d7ccb2da694ef0c2ae591141b800c4b
 SHA512:
-  metadata.gz: '01507058e722fc6cb79ca75d37188285e551effe36c5c31a2c3900375568ee3c1cb5c584f16a50e84fff88c71709fab797f4011784ede37cf0e356aa64d4a4f6'
-  data.tar.gz: 72c68d59ef4274e8636ab5b62431efe0fd2c3d3087bbca22e0afa82d6b10061acc7848d9e138f6832d970679f1668d428b2a4434571dd024ebb5933788671090
+  metadata.gz: f87fe6bf2fa5f9bc37dc344fb4b6f85d9e377ffb0d4eb5d4a7f2d87c33153830d72850907169b5aea7a52536e768e9e131113465ad9d9f11f80969179c8b7484
+  data.tar.gz: 8c9fd422e6003319dea3ada3f9b946208396fe25e3ecd6045c31f6a1252aec48c3e5da7be1bc9d549a54ed6aba69e4a42ef4d4eb1ab5b57d7eb7e48074ec8b6f

data/lib/dory/config.rb

@@ -33,6 +33,7 @@ module Dory
             #     yes|true (go aheand and kill without asking)
             #     no|false (don't kill, and don't even ask)
             kill_others: ask
+            service_start_delay: 5  # seconds to wait after restarting systemd services
           nginx_proxy:
             enabled: true
             container_name: dory_dinghy_http_proxy
@@ -95,7 +96,13 @@ module Dory
       end
 
       # Add the option to skip prompts
-      newsettings[:dory][:dnsmasq][:kill_others] = 'ask'
+      unless newsettings[:dory][:dnsmasq][:kill_others]
+        newsettings[:dory][:dnsmasq][:kill_others] = 'ask'
+      end
+
+      unless newsettings[:dory][:dnsmasq][:service_start_delay]
+        newsettings[:dory][:dnsmasq][:service_start_delay] = 5
+      end
 
       newsettings
     end

data/lib/dory/systemd.rb

@@ -2,6 +2,10 @@ require_relative 'docker_service'
 
 module Dory
   module Systemd
+    def self.up_delay_seconds
+      Dory::Config.settings[:dory][:dnsmasq][:service_start_delay] || 5
+    end
+
     def self.has_systemd?
       Sh.run_command('which systemctl').success?
     end
@@ -24,7 +28,15 @@ module Dory
     def self.set_systemd_service(service:, up:)
       action = up ? 'start' : 'stop'
       puts "Requesting sudo to #{action} #{service}".green
-      Sh.run_command("sudo systemctl #{action} #{service}").success?
+      retval = Sh.run_command("sudo systemctl #{action} #{service}").success?
+
+      # We need to wait a few seconds for init if putting stuff up to avoid race conditions
+      if up
+        puts "Waiting #{self.up_delay_seconds} seconds for #{service} to start ...".green
+        sleep(self.up_delay_seconds)
+      end
+
+      retval
     end
   end
 end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.6.1'
-  DATE    = '2016-07-12'
+  VERSION = '0.6.2'
+  DATE    = '2016-08-02'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize