From 96d3d334369c4c30562f30492823e8ab16e0c22d Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 8 Feb 2019 22:40:14 +0100
Subject: [PATCH] pep8
---
inventory_provider/__init__.py | 4 ++--
inventory_provider/routes/jobs.py | 1 +
inventory_provider/tasks/config.py | 2 +-
inventory_provider/tasks/worker.py | 12 +++++-------
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/inventory_provider/__init__.py b/inventory_provider/__init__.py
index 93023bfe..cdfb8608 100644
--- a/inventory_provider/__init__.py
+++ b/inventory_provider/__init__.py
@@ -40,7 +40,7 @@ def create_app():
"environment variable SETTINGS_FILENAME' must be defined"
logging.info("initializing Flask with config from: %r"
- % os.environ["SETTINGS_FILENAME"])
+ % os.environ["SETTINGS_FILENAME"])
app.config.from_envvar("SETTINGS_FILENAME")
assert "INVENTORY_PROVIDER_CONFIG_FILENAME" in app.config, (
@@ -55,7 +55,7 @@ def create_app():
with open(app.config["INVENTORY_PROVIDER_CONFIG_FILENAME"]) as f:
# test the config file can be loaded
logging.info("loading config from: %r"
- % app.config["INVENTORY_PROVIDER_CONFIG_FILENAME"])
+ % app.config["INVENTORY_PROVIDER_CONFIG_FILENAME"])
app.config["INVENTORY_PROVIDER_CONFIG"] = config.load(f)
logging.info('Inventory Provider Flask app initialized')
diff --git a/inventory_provider/routes/jobs.py b/inventory_provider/routes/jobs.py
index 8f2c9d20..99be6cff 100644
--- a/inventory_provider/routes/jobs.py
+++ b/inventory_provider/routes/jobs.py
@@ -10,6 +10,7 @@ def update():
current_app.config["INVENTORY_PROVIDER_CONFIG"])
return jsonify(job_ids)
+
@routes.route("update-interface-statuses")
def update_interface_statuses():
worker.update_interface_statuses.delay()
diff --git a/inventory_provider/tasks/config.py b/inventory_provider/tasks/config.py
index 02c3d9d4..9e59a193 100644
--- a/inventory_provider/tasks/config.py
+++ b/inventory_provider/tasks/config.py
@@ -6,4 +6,4 @@ broker_url = getenv(
result_backend = getenv(
'CELERY_BROKER_URL',
default='redis://test-dashboard02.geant.org:6379/1')
-task_eager_propagates = True
\ No newline at end of file
+task_eager_propagates = True
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index d7481fa7..95163f76 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -3,9 +3,7 @@ import logging
import re
from celery import bootsteps, Task, group, states
-from celery.utils.log import get_task_logger
from celery.result import AsyncResult
-from celery.signals import setup_logging
from collections import defaultdict
from lxml import etree
@@ -23,9 +21,11 @@ from inventory_provider import juniper
environment.setup_logging()
+
class InventoryTaskError(Exception):
pass
+
class InventoryTask(Task):
config = None
@@ -49,11 +49,13 @@ def _save_value(key, value):
# InventoryTask.logger.debug("saved %s" % key)
return "OK"
+
def _save_value_json(key, data_obj):
_save_value(
key,
json.dumps(data_obj))
+
def _save_value_etree(key, xml_doc):
_save_value(
key,
@@ -82,10 +84,6 @@ app.user_options['worker'].add(worker_args)
app.steps['worker'].add(WorkerArgs)
-@setup_logging.connect
-def _setup_logging(*args, **kwargs):
- return logging.getLogger(constants.TASK_LOGGER_NAME)
-
@app.task
def snmp_refresh_interfaces(hostname, community):
task_logger = logging.getLogger(constants.TASK_LOGGER_NAME)
@@ -356,6 +354,7 @@ def reload_router_config(self, hostname):
'message': 'OK'
}
+
def _derive_router_hostnames(config):
r = get_redis(config)
junosspace_equipment = set()
@@ -417,4 +416,3 @@ def check_task_status(task_id):
'success': r.status == states.SUCCESS,
'result': r.result
}
-
--
GitLab