From fad27a7f4dd323e246c16d40c1e388c47a98e5a4 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 6 Nov 2020 22:29:49 -0500 Subject: [PATCH] Lint: E131 continuation line unaligned for hanging indent --- daemon-common/network.py | 6 +++--- node-daemon/pvcnoded/DNSAggregatorInstance.py | 21 +++++++------------ node-daemon/pvcnoded/log.py | 4 ++-- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/daemon-common/network.py b/daemon-common/network.py index 24f9ada0..81f9c0b5 100644 --- a/daemon-common/network.py +++ b/daemon-common/network.py @@ -146,14 +146,14 @@ def getNetworkInformation(zk_conn, vni): 'network': ip6_network, 'gateway': ip6_gateway, 'dhcp_flag': dhcp6_flag, - }, - 'ip4': { + }, + 'ip4': { 'network': ip4_network, 'gateway': ip4_gateway, 'dhcp_flag': dhcp4_flag, 'dhcp_start': dhcp4_start, 'dhcp_end': dhcp4_end - } + } } return network_information diff --git a/node-daemon/pvcnoded/DNSAggregatorInstance.py b/node-daemon/pvcnoded/DNSAggregatorInstance.py index c3205cb7..37f6a7eb 100644 --- a/node-daemon/pvcnoded/DNSAggregatorInstance.py +++ b/node-daemon/pvcnoded/DNSAggregatorInstance.py @@ -91,8 +91,7 @@ class PowerDNSInstance(object): '--disable-syslog=yes', # Log only to stdout (which is then captured) '--disable-axfr=no', # Allow AXFRs '--allow-axfr-ips=0.0.0.0/0', # Allow AXFRs to anywhere - '--local-address={},{}'.format(self.vni_ipaddr, self.upstream_ipaddr), - # Listen on floating IPs + '--local-address={},{}'.format(self.vni_ipaddr, self.upstream_ipaddr), # Listen on floating IPs '--local-port=53', # On port 53 '--log-dns-details=on', # Log details '--loglevel=3', # Log info @@ -101,19 +100,13 @@ class PowerDNSInstance(object): '--slave-renotify=yes', # Renotify out for our slaved zones '--version-string=powerdns', # Set the version string '--default-soa-name=dns.pvc.local', # Override dnsmasq's invalid name - '--socket-dir={}'.format(self.config['pdns_dynamic_directory']), - # Standard socket directory + '--socket-dir={}'.format(self.config['pdns_dynamic_directory']), # Standard socket directory '--launch=gpgsql', # Use the PostgreSQL backend - '--gpgsql-host={}'.format(self.config['pdns_postgresql_host']), - # PostgreSQL instance - '--gpgsql-port={}'.format(self.config['pdns_postgresql_port']), - # Default port - '--gpgsql-dbname={}'.format(self.config['pdns_postgresql_dbname']), - # Database name - '--gpgsql-user={}'.format(self.config['pdns_postgresql_user']), - # User name - '--gpgsql-password={}'.format(self.config['pdns_postgresql_password']), - # User password + '--gpgsql-host={}'.format(self.config['pdns_postgresql_host']), # PostgreSQL instance + '--gpgsql-port={}'.format(self.config['pdns_postgresql_port']), # Default port + '--gpgsql-dbname={}'.format(self.config['pdns_postgresql_dbname']), # Database name + '--gpgsql-user={}'.format(self.config['pdns_postgresql_user']), # User name + '--gpgsql-password={}'.format(self.config['pdns_postgresql_password']), # User password '--gpgsql-dnssec=no', # Do DNSSEC elsewhere ] # Start the pdns process in a thread diff --git a/node-daemon/pvcnoded/log.py b/node-daemon/pvcnoded/log.py index 053bccc2..e8bec83d 100644 --- a/node-daemon/pvcnoded/log.py +++ b/node-daemon/pvcnoded/log.py @@ -43,7 +43,7 @@ class Logger(object): # Format maps format_map_colourized = { - # Colourized formatting with chevron prompts (log_colours = True) + # Colourized formatting with chevron prompts (log_colours = True) 'o': { 'colour': fmt_green, 'prompt': '>>> ' }, 'e': { 'colour': fmt_red, 'prompt': '>>> ' }, 'w': { 'colour': fmt_yellow, 'prompt': '>>> ' }, @@ -54,7 +54,7 @@ class Logger(object): 'x': { 'colour': last_colour, 'prompt': last_prompt } } format_map_textual = { - # Uncolourized formatting with text prompts (log_colours = False) + # Uncolourized formatting with text prompts (log_colours = False) 'o': { 'colour': '', 'prompt': 'ok: ' }, 'e': { 'colour': '', 'prompt': 'failed: ' }, 'w': { 'colour': '', 'prompt': 'warning: ' },