reformat to confirm PEPs

This commit is contained in:
Joachim Lusiardi 2016-05-17 07:45:05 +02:00
parent 6ab138a392
commit 1094e4043d
1 changed files with 19 additions and 7 deletions

View File

@ -8,8 +8,8 @@ import signal
import os import os
import logging import logging
target_path="/tmp/nginx/" target_path = "/tmp/nginx/"
pid_file="/var/run/nginx.pid" pid_file = "/var/run/nginx.pid"
non_location_template = """# proxy for container '$containername' non_location_template = """# proxy for container '$containername'
server { server {
listen $listen; listen $listen;
@ -25,7 +25,7 @@ server {
} }
""" """
location_template="""# proxy for container '$containername' location_template = """# proxy for container '$containername'
server { server {
listen $listen; listen $listen;
server_name $names; server_name $names;
@ -43,21 +43,24 @@ server {
} }
""" """
def print_json(data): def print_json(data):
"""Prints the given value in JSON to stdout. Use this for debugging only""" """Prints the given value in JSON to stdout. Use this for debugging only"""
print(json.dumps(data, sort_keys=True, indent=4)) print(json.dumps(data, sort_keys=True, indent=4))
def analyse_env_vars(inspect_data): def analyse_env_vars(inspect_data):
"""Extracts the environment variables from the given result of an 'inspect """Extracts the environment variables from the given result of an 'inspect
container' call.""" container' call."""
env_data = {} env_data = {}
if not 'Env' in inspect_data['Config'] or inspect_data['Config']['Env'] is None: if 'Env' not in inspect_data['Config'] or inspect_data['Config']['Env'] is None:
return env_data return env_data
for env_var in inspect_data['Config']['Env']: for env_var in inspect_data['Config']['Env']:
t = env_var.split("=") t = env_var.split("=")
env_data[t[0]] = t[1] env_data[t[0]] = t[1]
return env_data return env_data
def analyse_proxy_data(data): def analyse_proxy_data(data):
"""Extracts the data for the proxy configuration (envrionment variable """Extracts the data for the proxy configuration (envrionment variable
'PROXY_DATA' and converts it to a dictionary.""" 'PROXY_DATA' and converts it to a dictionary."""
@ -67,20 +70,24 @@ def analyse_proxy_data(data):
proxy_data[t[0]] = t[1] proxy_data[t[0]] = t[1]
return proxy_data return proxy_data
def extract_ip(inspect_data): def extract_ip(inspect_data):
"""extracts the container's ip from the given inspect data""" """extracts the container's ip from the given inspect data"""
return inspect_data['NetworkSettings']['IPAddress'] return inspect_data['NetworkSettings']['IPAddress']
def extract_name(inspect_data): def extract_name(inspect_data):
"""extracts the container's name from the given inspect data""" """extracts the container's name from the given inspect data"""
return inspect_data['Name'] return inspect_data['Name']
def get_if_available(dict, key, defValue):
if key in dict: def get_if_available(dictionary, key, defValue):
return dict[key] if key in dictionary:
return dictionary[key]
else: else:
return defValue return defValue
def handle_container(id): def handle_container(id):
"""This function take a container's id and collects all data required """This function take a container's id and collects all data required
to create a proper proxy configuration. The configuration is then to create a proper proxy configuration. The configuration is then
@ -111,15 +118,18 @@ def handle_container(id):
else: else:
file.write(Template(location_template).substitute(substitutes)) file.write(Template(location_template).substitute(substitutes))
def reload_nginx_configuration(): def reload_nginx_configuration():
logging.info('HUPing nginx') logging.info('HUPing nginx')
os.kill(pid, signal.SIGHUP) os.kill(pid, signal.SIGHUP)
def get_pid(): def get_pid():
"""This function reads the process id from the given file.""" """This function reads the process id from the given file."""
with open(pid_file, 'r') as file: with open(pid_file, 'r') as file:
return int(file.read()) return int(file.read())
def get_docker_id(): def get_docker_id():
"""This function extracts the container's id from /proc/self/cgroup.""" """This function extracts the container's id from /proc/self/cgroup."""
id = '' id = ''
@ -138,6 +148,7 @@ def get_docker_id():
logging.error('could not determine container\'s id!') logging.error('could not determine container\'s id!')
return id return id
def get_listen_ips(): def get_listen_ips():
inspect_data = client.inspect_container(get_docker_id()) inspect_data = client.inspect_container(get_docker_id())
mappings = inspect_data['NetworkSettings']['Ports']['80/tcp'] mappings = inspect_data['NetworkSettings']['Ports']['80/tcp']
@ -150,6 +161,7 @@ def get_listen_ips():
ips.append(data['HostIp']) ips.append(data['HostIp'])
return ips return ips
def setup_logging(): def setup_logging():
logging.basicConfig(format='%(asctime)s [%(levelname)s]: %(message)s', level=logging.INFO) logging.basicConfig(format='%(asctime)s [%(levelname)s]: %(message)s', level=logging.INFO)