publish_to_web 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70394ab03d24060bbadf5cf70f3aa2bccd50ccde
-  data.tar.gz: 04389aaecc439612dea87762d5a5281e72f37b30
+  metadata.gz: af20d39a6389731ea92171a36742afcfe9d8463e
+  data.tar.gz: d6f36d48e84d510f2cb22f8c08ff37ccc607bca9
 SHA512:
-  metadata.gz: ced2bbe8126a04482a4aa9a7e3eb91c5bc9e3204a0382fc792cd57838cfb2102fb5be7b50662c154fa97fc1b280a18eb8fb8023cedc4d0150ac4e2e88a3e298c
-  data.tar.gz: 9a07f7211592228b59620dab449318df1925a3df5a2d0df82806a42cd9386407c7af717e459a3a70e3514dbed9bd714091f1bc15a0f27607590d7be5a5075374
+  metadata.gz: 9f4da0373aacaca26d89457a39658fa3d744b44a35d1d71015fa764e45c35e77c9d9a3f2001a4676a2ca17a6bb498e980129a87780ca8356d38a3fddfd417b47
+  data.tar.gz: b1da80d1eec22a95212c34bd1a86f6d1268a3a99373c2ddf9eb50f9351a913c677888587b5746ef70a318e1a33b06b41c70aa34b03eda637ca9be64b915f58e8

data/lib/publish_to_web.rb

@@ -60,13 +60,15 @@ class PublishToWeb
     logger.info "Checking if local backend is available at #{bind_host}:#{forward_port}"
     TCPSocket.new(bind_host, forward_port).close
 
-  rescue Errno::ECONNREFUSED => err
+  rescue Errno::ECONNREFUSED
     logger.warn "Local backend is not available (yet?) - waiting for it to become available"
     sleep 5
     check_local_endpoint
   end
 
-  def prepare_directory
+  def prepare_directory(fail_gracefully = true)
+    config.success = config.error = nil
+
     if node_name = config.node_name
       unless ["#{node_name}", "#{node_name}.protonet.info"].include? directory.node_name
         directory.set_node_name node_name
@@ -74,39 +76,46 @@ class PublishToWeb
     end
     directory.set_version
     directory.public_key
+
+    config.success = 'directory_configured'
+  rescue PublishToWeb::Directory::HttpResponseError => err
+    logger.warn "#{err.class}: #{err}"
+    logger.warn "Failed to interact with directory, will try again in a bit"
+
+    # Write out that we have an issue since the directory might refuse
+    # our license, our chosen node name might be in conflict and so on
+    config.error = "directory_failure.#{err.response.status.to_i}"
+
+    raise unless fail_gracefully
   end
 
-  def start_tunnel
-    config.success = config.error = nil
+  def stop_tunnel
+    tunnel.stop
+    @thread.try :join
+  end
 
-    prepare_directory
-    config.success = 'directory_configured'
+  def start_tunnel(blocking = true)
+    unless blocking
+      @thread = Thread.new start_tunnel true
+      return
+    end
 
+    prepare_directory false
     check_local_endpoint
 
     logger.info "Starting tunnel to #{proxy_host} as #{directory.node_name}"
-    tunnel.start do
-      config.success = "connection_established"
-    end
+    tunnel.start { config.success = "connection_established" }
 
   rescue Net::SSH::AuthenticationFailed => err
     logger.warn "#{err.class}: #{err}"
     logger.warn "Probably the SSH key is not deployed on the proxy server yet, retrying in a bit"
 
     sleep 30
-    start_tunnel
+    retry
 
   rescue PublishToWeb::Directory::HttpResponseError => err
-    logger.warn "#{err.class}: #{err}"
-    logger.warn "Failed to interact with directory, will try again in a bit"
-
-    # Write out that we have an issue since the directory might refuse
-    # our license, our chosen node name might be in conflict and so on
-    config.success = nil
-    config.error = "directory_failure.#{err.response.status.to_i}"
-
     sleep 30
-    start_tunnel
+    retry
   end
 
   private

data/lib/publish_to_web/tunnel.rb

@@ -40,6 +40,10 @@ class PublishToWeb
       end
     end
 
+    def stop
+      @running = false
+    end
+
     def start
       Net::SSH.start proxy_host, proxy_user, ssh_options do |ssh|
         ssh.forward.remote forward_port, bind_host, remote_port do |real_remote_port|
@@ -53,7 +57,9 @@ class PublishToWeb
         end
 
         logger.info "Entering keepalive loop"
-        ssh.loop { true } # do not remove this block, documentation is broken
+
+        @running = true
+        ssh.loop { @running }
       end
     end
   end

data/lib/publish_to_web/version.rb

@@ -1,3 +1,3 @@
 class PublishToWeb
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: publish_to_web
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh