From bbf5e951868d91da5e51696767fe563464087688 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Fri, 16 Mar 2018 10:07:23 -0700 Subject: [PATCH] fix unusued import --- lemur/factory.py | 6 ++--- requirements.in | 66 ++++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lemur/factory.py b/lemur/factory.py index 6e0e9798..98868b6f 100644 --- a/lemur/factory.py +++ b/lemur/factory.py @@ -14,7 +14,6 @@ import os import imp import errno import pkg_resources -import socket from cmreslogging.handlers import CMRESHandler from logging import Formatter, StreamHandler @@ -165,7 +164,7 @@ def configure_logging(app): if app.config.get('ELASTICSEARCH_LOGGING', False): try: now = datetime.datetime.now() - handler = CMRESHandler( + es_handler = CMRESHandler( hosts=[ {'host': app.config.get("ELASTICSEARCH_LOGGING_HOST", "localhost"), 'port': app.config.get("ELASTICSEARCH_LOGGING_PORT", 7104)}], @@ -179,7 +178,8 @@ def configure_logging(app): now.day ) ) - app.logger.addHandler(handler) + es_handler.setLevel(app.config.get('LOG_LEVEL', 'DEBUG')) + app.logger.addHandler(es_handler) except Exception: # Let's not let a dns failure to ES cause the service to fail. app.logger.error("Unable to configure Elasticsearch logging.", exc_info=True) diff --git a/requirements.in b/requirements.in index 01316c0e..09e863f3 100644 --- a/requirements.in +++ b/requirements.in @@ -1,35 +1,35 @@ -CMRESHandler -Flask==0.12 -Flask-RESTful==0.3.6 -Flask-SQLAlchemy==2.1 -Flask-Script==2.0.6 -Flask-Migrate==2.1.1 -Flask-Bcrypt==0.7.1 -Flask-Principal==0.4.0 -Flask-Mail==0.9.1 -SQLAlchemy-Utils==0.32.21 -requests==2.11.1 -ndg-httpsclient==0.4.2 -psycopg2==2.7.3 -arrow==0.12.0 -six==1.11.0 -marshmallow-sqlalchemy==0.13.1 -gunicorn==19.7.1 -marshmallow==2.15.0 -cryptography==1.9 -xmltodict==0.11.0 -pyjwt==1.5.3 -lockfile==0.12.2 -inflection==0.3.1 -future==0.16.0 -boto3==1.5.7 acme==0.20.0 -retrying==1.3.3 -tabulate==0.8.2 -pyOpenSSL==17.2.0 -pem==17.1.0 -raven[flask]==6.2.1 -jinja2==2.10 -paramiko==2.4.0 # required for lemur_linuxdst plugin -pyldap==2.4.45 # required by ldap auth provider alembic-autogenerate-enums==0.0.2 +arrow==0.12.0 +boto3==1.5.7 +CMRESHandler +cryptography==1.9 +Flask-Bcrypt==0.7.1 +Flask-Mail==0.9.1 +Flask-Migrate==2.1.1 +Flask-Principal==0.4.0 +Flask-RESTful==0.3.6 +Flask-Script==2.0.6 +Flask-SQLAlchemy==2.1 +Flask==0.12 +future==0.16.0 +gunicorn==19.7.1 +inflection==0.3.1 +jinja2==2.10 +lockfile==0.12.2 +marshmallow-sqlalchemy==0.13.1 +marshmallow==2.15.0 +ndg-httpsclient==0.4.2 +paramiko # required for lemur_linuxdst plugin +pem==17.1.0 +psycopg2==2.7.3 +pyjwt==1.5.3 +pyldap # required by ldap auth provider +pyOpenSSL==17.2.0 +raven[flask]==6.2.1 +requests==2.11.1 +retrying==1.3.3 +six==1.11.0 +SQLAlchemy-Utils==0.32.21 +tabulate==0.8.2 +xmltodict==0.11.0