marathon-template 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a954fce7f07212d71bd14434522528cebc77ed3
-  data.tar.gz: 749566187f8ae78e6e85abff6f566c7225b14e98
+  metadata.gz: b2ea55fa3b0d54e349149d8377d53f362ff6aa12
+  data.tar.gz: cc0675725b9d1da54af378f23f52d629f9cec067
 SHA512:
-  metadata.gz: 3c11836e9bcaa8b0e15d9bf62456624c54e9dccc052de27859b12a81dab16da827d241d5c58c4acfed27dc44299cd8ae8c0e29b9c9f62a6b6ff6395e61daedbc
-  data.tar.gz: 1de8144eeac23b09f4cd5c2d18db3f431413267a2f7dd5f4afd04f42bc0cc556d2a4955fb33e2e04a41accaf160e94da6811cec819df1f87bf2e65cc183f4a4c
+  metadata.gz: 605a85748ca6c9a78827efb8cb33e63bcb0d40ba1bc0cd3d616483e1cbcf26c425191fdff40998d863f1c808417c7141be7a3812cd5e827716df24b945134222
+  data.tar.gz: 65bd43d891ada88ae4448c06c123eac912e3f65a972f99e9117dd504f22817150abf7adec0cf87104f6a8a765ab33de84d5f7f1ef41685c089eee57c8c934950

data/ext/haproxy_example.yaml

@@ -0,0 +1,65 @@
+---
+# Where is your Marathon?
+marathon: 'http://10.33.100.11:8080'
+# Main HaProxy block
+haproxy:
+  global:
+    daemon:
+    log:
+      - '127.0.0.1 local0'
+      - '127.0.0.1 local1 notice'
+    maxconn: 4096
+  defaults:
+    log: global
+    mode: http
+    retries: 3
+    maxconn: 2000
+# Any HaProxy param that it utilized more than once can be passed a hash of options
+    timeout:
+      connect: '5s'
+      client: '50s'
+      server: '50s'
+      http-keep-alive: 1s
+      http-request: 15s
+      queue: 30s
+      tarpit: 60s
+# Or an array of options
+    option:
+      - httplog
+      - dontlognull
+      - forwardfor
+      - http-server-close
+      - redispatch 
+# Listen block 
+  listens:
+    stats_test:
+      bind: '0.0.0.0:9090'
+      mode: http
+      stats:
+        - enable
+        - hide-version
+        - 'url /'
+        - 'auth admin:admin'
+# Optional server block
+#      server:    
+#        app_name: my_app_name_in_marathon
+# Options to pass into haproxy config on the server line
+#        options: check
+#
+# Frontend blocks
+  frontends:
+    http-in:
+      bind: '*:80'
+      mode: http
+      default_backend: nodes
+# Backend blocks
+  backends:
+    nodes:
+      balance: leastconn
+      option: forwardfor
+      http-request: 
+        - 'http-request set-header X-Forwarded-Port %[dst_port]'
+# Backend also accept the server block
+      server:    
+        app_name: my_app_name_in_marathon
+        options: check

data/lib/marathon-template/deploy.rb

@@ -144,7 +144,11 @@ module Marathon_template
           return_hash[task['host']] = task['ports']
         end
       else
-        abort LOG.error "Failed connecting to #{@uri}, response code: #{response.code}"
+        if response.code == '404'
+          abort LOG.error "Failed connecting to #{marathon_app}, response code: #{response.code}\n Are you sure the app #{app_name} exists?"
+        else
+          abort LOG.error "Failed connecting to #{marathon_app}, response code: #{response.code}"
+        end
       end
       return_hash
     end

data/lib/marathon-template/options.rb

@@ -27,18 +27,9 @@ module Marathon_template
       @config[:haproxy_backends]    = config_file['haproxy']['backends']    || nil
       @config[:haproxy_path]        = config_file['haproxy_path']           || '/etc/haproxy'
       @config[:cron_splay]          = config_file['cron_splay_time']        || '* * * * * marathon_template'
-      # Determine where HaProxy lives
-#      distro = IO.popen('uname').readlines
-#      if distro == 'Linux' 
-#        @config[:distro] = distro
-#      else
-#        abort "Sorry, #{distro} is not supported." 
-#      end
-
-#      @config.each do |k,v|
-#        LOG.info("#{k}: #{v}")
-#      end
-      @config
+      @config.each do |k,v|
+        LOG.info("#{k}: #{v}")
+      end       
     end
   end
 end

data/lib/marathon_template.rb

@@ -1,5 +1,4 @@
 #!/bin/env ruby
-#$LOAD_PATH << '.'
 begin
 
   require 'rubygems'
@@ -23,10 +22,13 @@ module Marathon_template
   begin
     # Set up logging to STDOUT
     LOG = Logger.new(STDOUT) 
-    
+
     # Get our config file
     config_path = ENV['MARATHON_TEMPLATE_CONFIG_PATH'] || '/etc/haproxy.yaml' 
-    
+    if ! File.exists? config_path
+      abort LOG.info "No haproxy yaml configuration found at #{config_path}. Please see https://github.com/malnick/marathon_template/blob/master/ext/haproxy_example.yaml for an example"
+    end
+
     # Create a usable hash of configuration 
     CONFIG = Marathon_template::Options.initialize(config_path)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marathon-template
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jeff Malnick
@@ -18,6 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ext/haproxy_example.yaml
 - lib/marathon_template.rb
 - lib/marathon-template/deploy.rb
 - lib/marathon-template/cron.rb