Merge branch 'memcached'
This commit is contained in:
commit
c657134c2c
3
debian/control
vendored
3
debian/control
vendored
@ -8,5 +8,6 @@ Vcs-Git: https://github.com/Difrex/surok
|
|||||||
|
|
||||||
Package: surok
|
Package: surok
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: python3-jinja2, python3-dnsq, python3-requests, python3-memcache (>= 1.57)
|
Depends: python3-jinja2, python3-dnsq, python3-requests
|
||||||
|
Recommends: python3-memcache (>= 1.57)
|
||||||
Description: Service discovery for Apache Mesos clusters
|
Description: Service discovery for Apache Mesos clusters
|
||||||
|
@ -2,7 +2,6 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
import requests
|
import requests
|
||||||
import memcache
|
|
||||||
from .discovery import resolve
|
from .discovery import resolve
|
||||||
|
|
||||||
|
|
||||||
@ -101,6 +100,7 @@ def reload_conf(service_conf, app_conf, conf, app_hosts):
|
|||||||
# Need rewriting
|
# Need rewriting
|
||||||
################
|
################
|
||||||
if 'memcached' in conf:
|
if 'memcached' in conf:
|
||||||
|
import memcache
|
||||||
if conf['memcached']['enabled'] is True:
|
if conf['memcached']['enabled'] is True:
|
||||||
# Check old servers
|
# Check old servers
|
||||||
mc_hosts = None
|
mc_hosts = None
|
||||||
|
Loading…
Reference in New Issue
Block a user