Use base library

Dockerfile

@@ -1,10 +1,6 @@
-FROM python:3.5.1-alpine 
+FROM csmith/service-reporter-lib:latest 
 MAINTAINER Chris Smith <chris87@gmail.com> 
 
-RUN \
-  pip install \
-    python-etcd
-
 COPY *.py /
 
 VOLUME ["/letsencrypt"]

fetcher.py

@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-
-import etcd
-import time
-
-
-class Fetcher:
-
-  def __init__(self, host, port, prefix):
-    self._client = etcd.Client(host=host, port=port)
-    self._prefix = prefix
-
-
-  def _read(self, key, **kwargs):
-    try:
-      node = self._client.read(self._prefix + key, **kwargs)
-      return node.value if node else None
-    except etcd.EtcdKeyNotFound:
-      return None
-
-
-  def _read_recursive(self, key):
-    try:
-      return self._client.read(self._prefix + key, recursive=True)
-    except etcd.EtcdKeyNotFound:
-      return None 
-
-
-  def get_label(self, label):
-    node = self._read_recursive('/labels/%s' % label)
-    if node:
-      return {child.key.split('/')[-1]: child.value for child in node.children}
-    else:
-      return {}
-
-
-  def wait_for_update(self):
-    original_time = self._read('/_updated')
-    new_time = original_time
-
-    while new_time == original_time:
-      try:
-        new_time = self._read('/_updated', wait=True)
-      except etcd.EtcdWatchTimedOut:
-        new_time = self._read('/_updated')
-      time.sleep(10)
-

generate.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 from collections import defaultdict
-from fetcher import Fetcher
 import argparse
+import etcdlib
 import os
 
 parser = argparse.ArgumentParser()
@@ -12,7 +12,7 @@ parser.add_argument('--etcd-host', help='Host to connect to etcd on', default='e
 parser.add_argument('--etcd-prefix', help='Prefix to use when retrieving keys from etcd', default='/docker')
 args = parser.parse_args()
 
-fetcher = Fetcher(args.etcd_host, args.etcd_port, args.etcd_prefix)
+fetcher = etcdlib.Connection(args.etcd_host, args.etcd_port, args.etcd_prefix)
 
 while True:
   domains = defaultdict(set)