From 0cc51ad082f52772889dcf15d51cd08df69caa31 Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Mon, 22 Oct 2018 12:56:15 +0200
Subject: [PATCH] Fixed logging

---
 ckan/cli/__init__.py | 11 ++---------
 ckan/cli/server.py   |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ckan/cli/__init__.py b/ckan/cli/__init__.py
index 6fec119ad89..fe693e0cd98 100644
--- a/ckan/cli/__init__.py
+++ b/ckan/cli/__init__.py
@@ -4,18 +4,13 @@
 
 import click
 import logging
+from logging.config import fileConfig as loggingFileConfig
 from flask import Flask, current_app
 from flask.cli import AppGroup, with_appcontext
 from werkzeug.serving import run_simple
 
-from ckan.common import config
-from ckan.config.environment import load_environment
-from ckan.config.middleware import make_app
-
 
 log = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO,
-                    format='%(asctime)s %(levelname)s [%(name)s] %(message)s')
 
 
 click_config_option = click.option(
@@ -28,8 +23,6 @@
 
 def load_config(config=None):
     from paste.deploy import appconfig
-    from paste.script.util.logging_config import fileConfig
-    log.info("Searching for configuration file")
     if config:
         filename = os.path.abspath(config)
         config_source = u'-c parameter'
@@ -53,5 +46,5 @@ def load_config(config=None):
         msg += u'\n(Given by: %s)' % config_source
         exit(msg)
 
-    fileConfig(filename)
+    loggingFileConfig(filename)
     return appconfig(u'config:' + filename)
diff --git a/ckan/cli/server.py b/ckan/cli/server.py
index 5e9b89d2e57..4f8b9de3a3e 100644
--- a/ckan/cli/server.py
+++ b/ckan/cli/server.py
@@ -17,5 +17,4 @@
 @click.pass_context
 def run(ctx, host, port, reloader):
     u'''Runs development server'''
-    # click.secho(u"Starting CKAN", fg='yellow')
     run_simple(host, port, ctx.obj.app, use_reloader=reloader, use_evalex=True)