publish_to_web 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af20d39a6389731ea92171a36742afcfe9d8463e
-  data.tar.gz: d6f36d48e84d510f2cb22f8c08ff37ccc607bca9
+  metadata.gz: 513b504f81cdb70f0107f978e0d93c2dae1f2ed9
+  data.tar.gz: caa4ed5aabeb33272237bc04ec6dbff7e25c346b
 SHA512:
-  metadata.gz: 9f4da0373aacaca26d89457a39658fa3d744b44a35d1d71015fa764e45c35e77c9d9a3f2001a4676a2ca17a6bb498e980129a87780ca8356d38a3fddfd417b47
-  data.tar.gz: b1da80d1eec22a95212c34bd1a86f6d1268a3a99373c2ddf9eb50f9351a913c677888587b5746ef70a318e1a33b06b41c70aa34b03eda637ca9be64b915f58e8
+  metadata.gz: 4953c26f10375bdfb879e11ecc1dc556c30a59608d93df432a345e2535b24e952176d2e8acb3fc87cfc61b3afbf45e5848a5d7343490ae45d88b175456157dc4
+  data.tar.gz: 6bcb83fb8a83c50ed286b7ddd6559358602a24a099f7cfa6e3bc2398ca8cd5fde6be1832cd1347073fc292f3c5d493265c193162c192cb9942523c139bfd9b12

data/lib/publish_to_web.rb

@@ -66,11 +66,12 @@ class PublishToWeb
     check_local_endpoint
   end
 
+  SLD = Regexp.escape '.protonet.info'
   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
+      if /^#{ Regexp.escape node_name }(#{ SLD })?$/ !~ directory.node_name
         directory.set_node_name node_name
       end
     end
@@ -89,14 +90,20 @@ class PublishToWeb
     raise unless fail_gracefully
   end
 
-  def stop_tunnel
+  def stop_tunnel(*join_args)
     tunnel.stop
-    @thread.try :join
+    @thread.join *join_args if @thread
   end
 
-  def start_tunnel(blocking = true)
+  def start_tunnel(blocking: true)
     unless blocking
-      @thread = Thread.new start_tunnel true
+      @thread = Thread.new do
+        begin
+          start_tunnel blocking: true
+          logger.warn "Tunnel closed... :/"
+        end while tunnel.running? and sleep(5)
+      end
+      @thread.abort_on_exception = true
       return
     end
 
@@ -107,15 +114,24 @@ class PublishToWeb
     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
     retry
 
-  rescue PublishToWeb::Directory::HttpResponseError => err
+  rescue PublishToWeb::Directory::HttpResponseError
+
+    # already handled by #prepare_directory, we just need to wait and retry...
+
     sleep 30
     retry
+
+  rescue => error
+
+    logger.error error
+
   end
 
   private
@@ -126,12 +142,12 @@ class PublishToWeb
 
     def tunnel
       @tunnel ||= Tunnel.new proxy_host: proxy_host,
-        proxy_user: proxy_user, 
-        proxy_port: proxy_port,
-        identity: directory.private_key,
-        bind_host: bind_host, 
-        remote_port: directory.remote_port,
+        proxy_user:   proxy_user, 
+        proxy_port:   proxy_port,
+        identity:     directory.private_key,
+        bind_host:    bind_host, 
+        remote_port:  directory.remote_port,
         forward_port: forward_port,
-        logger: self.class.create_logger
+        logger:       self.class.create_logger
     end
-end
+end

data/lib/publish_to_web/tunnel.rb

@@ -15,6 +15,7 @@ class PublishToWeb
 
     def ssh_options
       @ssh_options ||= {
+        keepalive: true,
         keepalive_interval: 5,
         paranoid: false,
         # ExitOnForwardFailure ??
@@ -44,6 +45,10 @@ class PublishToWeb
       @running = false
     end
 
+    def running?
+      @running
+    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|

data/lib/publish_to_web/version.rb

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

metadata

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