ts-admin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38d80d69b3c2bbae9e237d74acf92504366ce6a
-  data.tar.gz: e84f8bf4205e3ed0120aeeb2534f8501c53cccea
+  metadata.gz: 2fba606ded7a3826b1ea2cbddda05bcc19ca2b7a
+  data.tar.gz: 26a47753ba7cec3e7d728240abd0390472b4a519
 SHA512:
-  metadata.gz: 443bd6c4b09851e653eaf1fa7d097c39c03d08b792e22b5a7b765b8ebc71b4248f6221c2a3332d6ec66e024dc035d85c78027f67b711cdc39b42a65489f4c6b0
-  data.tar.gz: f6700bed37709a9d606bbcfd7be7720969f07ebbf0a93f4ac641f3f1a690b73632160fd56c2f3fe5f8124ee7e8821d520c043de0b5b42b2150eefaae580f75c9
+  metadata.gz: 7a69c6c728475b1ae22528aefeee9b5e4e60d15b1aa5a31592c53c71234a3819e54a156ec746146f1ff8fa1465345a57e72353b672f8bcd3b845c3544dc63b9e
+  data.tar.gz: e46c5591f92b31f669be887730da8cd0ec9ec13daad649dad8d80ab7b5cc7baf299006e18c58ea3109a7defbc88788a5906b832653f27a57f01ee833cc337f2b

data/controller/init.rb

@@ -46,6 +46,17 @@ class Controller < Ramaze::Controller
     @_traffic_server ||= ::TSAdmin::TrafficServer.new(APP_CONFIG['traffic_server'])
   end
 
+  def restart_traffic_server
+    @@restart_scheduled = true
+    @@restart_thread = Thread.new do
+      while @@restart_scheduled
+        @@restart_scheduled = false
+        traffic_server.restart
+      end
+      @@restart_thread = nil
+    end if !defined?(@@restart_thread) || @@restart_thread.nil?
+  end
+
 end
 
 # Here you can require all your other controllers. Note that if you have multiple

data/controller/main.rb

@@ -4,7 +4,7 @@ class MainController < Controller
     return unless login_required
 
     external_ip_fallback = '<span class="none">none</span>'
-    @external_ip = (APP_CONFIG['info']['external_ip2'] || external_ip_fallback) rescue external_ip_fallback
+    @external_ip = (APP_CONFIG['info']['external_ip'] || external_ip_fallback) rescue external_ip_fallback
   end
 
 end

data/controller/remap.rb

@@ -16,7 +16,7 @@ class RemapController < Controller
       @to = request[:to]
       if traffic_server.add_remap(@type, @from, @to)
         traffic_server.save
-        traffic_server.restart
+        restart_traffic_server
         flash[:info] = "Remap entry added"
         call(r('/'))
       else
@@ -39,7 +39,7 @@ class RemapController < Controller
       @to = request[:to]
       if traffic_server.edit_remap(@id, @from, @to)
         traffic_server.save
-        traffic_server.restart
+        restart_traffic_server
         flash[:info] = "Remap entry updated"
         call(r('/'))
       else
@@ -61,7 +61,7 @@ class RemapController < Controller
 
     traffic_server.delete_remap(request[:id])
     traffic_server.save
-    traffic_server.restart
+    restart_traffic_server
 
     flash[:info] = "Remap entry removed"
 

data/lib/ts-admin/traffic_server.rb

@@ -71,10 +71,12 @@ module TSAdmin
       own_config = ''
       own_config << "#{marker_begin}\n"
       redirects.each do |redirect|
-        own_config << "redirect #{redirect[:from]} #{redirect[:to]} #{redirect[:options] if redirect[:options]}\n"
+        options = redirect[:options] ? '' : ''
+        own_config << "redirect #{redirect[:from]} #{redirect[:to]} #{options}\n"
       end
       maps.each do |map|
-        own_config << "map #{map[:from]} #{map[:to]} #{map[:options] if map[:options]}\n"
+        options = map[:options] ? '' : ''
+        own_config << "map #{map[:from]} #{map[:to]} #{options}\n"
       end
       own_config << "#{marker_end}\n"
 

data/lib/ts-admin/version.rb

@@ -1,3 +1,3 @@
 module TSAdmin
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ts-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Florian Schwab