merge

.gitignore

@@ -1,2 +1,4 @@
 surok/__pycache__
 __pycache__
+*.pyc
+*.swp

conf.d/1.json

@@ -1 +0,0 @@
-{}

conf.d/selfcheck.json

@@ -0,0 +1,12 @@
+{
+    "services": [
+      {
+        "name": "",
+        "group": "mesos"
+      }
+    ],
+    "conf_name": "selfcheck",
+    "template": "templates/selfcheck.jj2",
+    "dest": "selfcheck",
+    "reload_cmd": "/bin/echo selfcheck ok"
+}

conf/surok.json

@@ -1,4 +1,7 @@
 {
-    "marathon": "10.0.1.199:8080",
+    "marathon": "TODO",
-    "confd": "conf.d"
+    "confd": "conf.d",
+    "domain": "marathon.mesos",
+    "wait_time": 20,
+    "lock_dir": "/var/tmp"
 }

surok/discovery.py

@@ -1,11 +1,18 @@
 import dns.resolver
 
 def resolve(app, conf):
-    hosts = []
+    hosts = {}
+    services = app['services']
     domain = conf['domain']
-    for rdata in dns.resolver.query('_' + app['name'] + '.' + app['group'] + '._tcp.' + domain, 'SRV'):
+    for service in services:
+        hosts[service['name']] = []
+        try:
+            for rdata in dns.resolver.query('_' + service['name'] + '.' + service['group'] + '._tcp.' + domain, 'SRV'):
                 info = str(rdata).split()
                 server = { 'name': info[3], 'port': info[2] }
-        hosts.append(server)
+
+                hosts[ service['name'] ].append(server)
+        except Exception as e:
+            print("Could not resolve " + service['name'] + '.' + service['group'] + '._tcp.' + domain)
 
     return hosts

surok/system.py

@@ -28,14 +28,14 @@ def write_lock(name, service_conf):
 def reload_conf(service_conf, app_conf):
     
     # Check old config
-    if get_old(app_conf['name'], service_conf) != 1:
+    if get_old(app_conf['conf_name'], service_conf) != 1:
         print('Write new configuration')
 
         f = open(app_conf['dest'], 'w')
         f.write(service_conf)
         f.close()
 
-        write_lock(app_conf['name'], service_conf)
+        write_lock(app_conf['conf_name'], service_conf)
 
         # Reload conf
         stdout = os.popen(app_conf['reload_cmd']).read()

surok/templates.py

@@ -1,4 +1,5 @@
 from jinja2 import Environment, PackageLoader, Template
+import os
 
 
 # Return rendered configuration 
@@ -8,5 +9,6 @@ def gen(my, jj2):
     f.close()
 
     template = Template(temp)
+    my['env'] = os.environ
 
     return template.render(my=my)

templates/nginx_proxy.jj2

@@ -0,0 +1,11 @@
+    {% for host in my['hosts'] %}
+    server {{host['kioskservice']['name']}}:{{host['kioskservice']['port']}};
+    {% endfor %}
+
+server {
+    listen 0.0.0.0:80;
+    server_name _;
+
+    location / {
+    }
+}

templates/selfcheck.jj2

@@ -0,0 +1 @@
+OK