From 64b733396cb6465713ca514e6dd4ac65ff473160 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Tue, 16 Dec 2014 12:49:16 +0100
Subject: [PATCH] Fix cyclic import (again)

glances_globals <-> glances_logging
---
 glances/__init__.py                     |  3 ++-
 glances/core/glances_autodiscover.py    |  3 ++-
 glances/core/glances_client.py          |  3 ++-
 glances/core/glances_client_browser.py  |  4 ++--
 glances/core/glances_config.py          |  2 +-
 glances/core/glances_globals.py         |  5 -----
 glances/core/glances_logging.py         |  2 ++
 glances/core/glances_main.py            |  3 ++-
 glances/core/glances_monitor_list.py    |  2 +-
 glances/core/glances_password.py        | 10 ++--------
 glances/core/glances_processes.py       |  3 ++-
 glances/core/glances_server.py          |  5 +++--
 glances/core/glances_snmp.py            |  2 +-
 glances/core/glances_standalone.py      |  3 ++-
 glances/core/glances_staticlist.py      |  2 +-
 glances/core/glances_stats.py           |  3 ++-
 glances/outputs/glances_bottle.py       |  3 +--
 glances/outputs/glances_colorconsole.py |  2 +-
 glances/outputs/glances_csv.py          |  3 ++-
 glances/outputs/glances_curses.py       |  3 ++-
 glances/outputs/glances_history.py      |  2 +-
 glances/plugins/glances_batpercent.py   |  2 +-
 glances/plugins/glances_monitor.py      |  2 +-
 glances/plugins/glances_plugin.py       |  3 ++-
 glances/plugins/glances_sensors.py      |  3 ++-
 25 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/glances/__init__.py b/glances/__init__.py
index 68a6401e..c5c0200f 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -40,7 +40,8 @@ except ImportError:
 
 # Import Glances libs
 # Note: others Glances libs will be imported optionally
-from glances.core.glances_globals import gettext_domain, locale_dir, logger
+from glances.core.glances_globals import gettext_domain, locale_dir
+from glances.core.glances_logging import logger
 from glances.core.glances_main import GlancesMain
 
 # Get PSutil version
diff --git a/glances/core/glances_autodiscover.py b/glances/core/glances_autodiscover.py
index 4b4e66db..62d627b1 100644
--- a/glances/core/glances_autodiscover.py
+++ b/glances/core/glances_autodiscover.py
@@ -39,7 +39,8 @@ except ImportError:
     zeroconf_tag = False
 
 # Import Glances libs
-from glances.core.glances_globals import appname, logger
+from glances.core.glances_globals import appname
+from glances.core.glances_logging import logger
 
 # Zeroconf 0.16 or higher is needed
 if zeroconf_tag:
diff --git a/glances/core/glances_client.py b/glances/core/glances_client.py
index e430bbdf..49fe058c 100644
--- a/glances/core/glances_client.py
+++ b/glances/core/glances_client.py
@@ -35,7 +35,8 @@ except ImportError:
     import httplib
 
 # Import Glances libs
-from glances.core.glances_globals import logger, version
+from glances.core.glances_globals import version
+from glances.core.glances_logging import logger
 from glances.core.glances_stats import GlancesStatsClient
 from glances.outputs.glances_curses import GlancesCursesClient
 
diff --git a/glances/core/glances_client_browser.py b/glances/core/glances_client_browser.py
index 753e1a09..2c1bf957 100644
--- a/glances/core/glances_client_browser.py
+++ b/glances/core/glances_client_browser.py
@@ -29,11 +29,11 @@ except ImportError:
     from xmlrpclib import ServerProxy, Fault, ProtocolError
 
 # Import Glances libs
-from glances.core.glances_globals import logger
-from glances.outputs.glances_curses import GlancesCursesBrowser
 from glances.core.glances_autodiscover import GlancesAutoDiscoverServer
 from glances.core.glances_client import GlancesClient, GlancesClientTransport
+from glances.core.glances_logging import logger
 from glances.core.glances_staticlist import GlancesStaticServer
+from glances.outputs.glances_curses import GlancesCursesBrowser
 
 
 class GlancesClientBrowser(object):
diff --git a/glances/core/glances_config.py b/glances/core/glances_config.py
index 992d3887..2b690836 100644
--- a/glances/core/glances_config.py
+++ b/glances/core/glances_config.py
@@ -37,10 +37,10 @@ from glances.core.glances_globals import (
     is_mac,
     is_py3,
     is_windows,
-    logger,
     sys_prefix,
     work_path
 )
+from glances.core.glances_logging import logger
 
 
 class Config(object):
diff --git a/glances/core/glances_globals.py b/glances/core/glances_globals.py
index 6cf19e6e..620439eb 100644
--- a/glances/core/glances_globals.py
+++ b/glances/core/glances_globals.py
@@ -22,8 +22,6 @@
 import os
 import sys
 
-from glances.core.glances_logging import glances_logger
-
 # Global information
 appname = 'glances'
 version = __import__('glances').__version__
@@ -61,6 +59,3 @@ i18n_path = os.path.realpath(os.path.join(work_path, '..', '..', 'i18n'))
 user_i18n_path = os.path.join(os.path.expanduser('~/.local'), 'share', 'locale')
 sys_i18n_path = os.path.join(sys_prefix, 'share', 'locale')
 locale_dir = get_locale_path([i18n_path, user_i18n_path, sys_i18n_path])
-
-# Create and init the logging instance
-logger = glances_logger()
diff --git a/glances/core/glances_logging.py b/glances/core/glances_logging.py
index 55455615..f1e0e5d4 100644
--- a/glances/core/glances_logging.py
+++ b/glances/core/glances_logging.py
@@ -82,3 +82,5 @@ def glances_logger():
                             level=logging.DEBUG,
                             format='%(asctime)s -- %(levelname)s -- %(message)s')
     return _logger
+
+logger = glances_logger()
diff --git a/glances/core/glances_main.py b/glances/core/glances_main.py
index 38b99c67..ab997dde 100644
--- a/glances/core/glances_main.py
+++ b/glances/core/glances_main.py
@@ -27,7 +27,8 @@ import tempfile
 
 # Import Glances libs
 from glances.core.glances_config import Config
-from glances.core.glances_globals import appname, is_windows, logger, psutil_version, version
+from glances.core.glances_globals import appname, is_windows, psutil_version, version
+from glances.core.glances_logging import logger
 
 
 class GlancesMain(object):
diff --git a/glances/core/glances_monitor_list.py b/glances/core/glances_monitor_list.py
index 1b59e7f3..5bc20e12 100644
--- a/glances/core/glances_monitor_list.py
+++ b/glances/core/glances_monitor_list.py
@@ -24,7 +24,7 @@ import re
 import subprocess
 
 # Import Glances lib
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 from glances.core.glances_processes import glances_processes
 
 
diff --git a/glances/core/glances_password.py b/glances/core/glances_password.py
index 017640cb..87e6d137 100644
--- a/glances/core/glances_password.py
+++ b/glances/core/glances_password.py
@@ -27,14 +27,8 @@ import sys
 import uuid
 
 # Import Glances lib
-from glances.core.glances_globals import (
-    appname,
-    is_bsd,
-    is_linux,
-    is_mac,
-    is_windows,
-    logger
-)
+from glances.core.glances_globals import appname, is_bsd, is_linux, is_mac, is_windows
+from glances.core.glances_logging import logger
 
 # Trick: bind raw_input to input in Python 2
 try:
diff --git a/glances/core/glances_processes.py b/glances/core/glances_processes.py
index cbecd134..07755fa4 100644
--- a/glances/core/glances_processes.py
+++ b/glances/core/glances_processes.py
@@ -27,7 +27,8 @@ import re
 import psutil
 
 # Import Glances lib
-from glances.core.glances_globals import is_bsd, is_linux, is_mac, is_windows, logger
+from glances.core.glances_globals import is_bsd, is_linux, is_mac, is_windows
+from glances.core.glances_logging import logger
 from glances.core.glances_timer import getTimeSinceLastUpdate, Timer
 
 
diff --git a/glances/core/glances_server.py b/glances/core/glances_server.py
index 98436ac4..f4ecd07c 100644
--- a/glances/core/glances_server.py
+++ b/glances/core/glances_server.py
@@ -32,10 +32,11 @@ except ImportError:  # Python 2
     from SimpleXMLRPCServer import SimpleXMLRPCServer
 
 # Import Glances libs
-from glances.core.glances_globals import logger, version
+from glances.core.glances_autodiscover import GlancesAutoDiscoverClient
+from glances.core.glances_globals import version
+from glances.core.glances_logging import logger
 from glances.core.glances_stats import GlancesStatsServer
 from glances.core.glances_timer import Timer
-from glances.core.glances_autodiscover import GlancesAutoDiscoverClient
 
 
 class GlancesXMLRPCHandler(SimpleXMLRPCRequestHandler):
diff --git a/glances/core/glances_snmp.py b/glances/core/glances_snmp.py
index 783d27d4..9e62d177 100644
--- a/glances/core/glances_snmp.py
+++ b/glances/core/glances_snmp.py
@@ -20,7 +20,7 @@
 import sys
 
 # Import Glances libs
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 
 # Import mandatory PySNMP lib
 try:
diff --git a/glances/core/glances_standalone.py b/glances/core/glances_standalone.py
index 14fc5383..43332277 100644
--- a/glances/core/glances_standalone.py
+++ b/glances/core/glances_standalone.py
@@ -20,7 +20,8 @@
 """Manage the Glances standalone session."""
 
 # Import Glances libs
-from glances.core.glances_globals import is_windows, logger
+from glances.core.glances_globals import is_windows
+from glances.core.glances_logging import logger
 from glances.core.glances_processes import glances_processes
 from glances.core.glances_stats import GlancesStats
 from glances.outputs.glances_curses import GlancesCursesStandalone
diff --git a/glances/core/glances_staticlist.py b/glances/core/glances_staticlist.py
index 08b17fc1..56db4d22 100644
--- a/glances/core/glances_staticlist.py
+++ b/glances/core/glances_staticlist.py
@@ -23,7 +23,7 @@
 from socket import gaierror, gethostbyname
 
 # Import Glances libs
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 
 
 class GlancesStaticServer(object):
diff --git a/glances/core/glances_stats.py b/glances/core/glances_stats.py
index 5011d028..55caee88 100644
--- a/glances/core/glances_stats.py
+++ b/glances/core/glances_stats.py
@@ -24,7 +24,8 @@ import os
 import re
 import sys
 
-from glances.core.glances_globals import logger, plugins_path, sys_path
+from glances.core.glances_globals import plugins_path, sys_path
+from glances.core.glances_logging import logger
 
 # SNMP OID regexp pattern to short system name dict
 oid_to_short_system_name = {'.*Linux.*': 'linux',
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py
index 8606ad7b..96809588 100644
--- a/glances/outputs/glances_bottle.py
+++ b/glances/outputs/glances_bottle.py
@@ -24,14 +24,13 @@ import os
 import sys
 
 # Import Glances libs
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 
 # Import mandatory Bottle lib
 try:
     from bottle import Bottle, template, static_file, TEMPLATE_PATH, abort, response
 except ImportError:
     logger.critical('Bottle module not found. Glances cannot start in web server mode.')
-    print(_("Install it using pip: # pip install bottle"))
     sys.exit(2)
 
 
diff --git a/glances/outputs/glances_colorconsole.py b/glances/outputs/glances_colorconsole.py
index f23f4cfc..8407114c 100644
--- a/glances/outputs/glances_colorconsole.py
+++ b/glances/outputs/glances_colorconsole.py
@@ -23,7 +23,7 @@ import time
 
 import msvcrt
 
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 
 try:
     import colorconsole
diff --git a/glances/outputs/glances_csv.py b/glances/outputs/glances_csv.py
index 1aa02eed..4c5b7bce 100644
--- a/glances/outputs/glances_csv.py
+++ b/glances/outputs/glances_csv.py
@@ -24,7 +24,8 @@ import csv
 import sys
 
 # Import Glances lib
-from glances.core.glances_globals import is_py3, logger
+from glances.core.glances_globals import is_py3
+from glances.core.glances_logging import logger
 
 # List of stats enabled in the CSV output
 csv_stats_list = ['cpu', 'load', 'mem', 'memswap']
diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py
index b5c3812a..318c307c 100644
--- a/glances/outputs/glances_curses.py
+++ b/glances/outputs/glances_curses.py
@@ -23,7 +23,8 @@
 import sys
 
 # Import Glances lib
-from glances.core.glances_globals import is_mac, is_windows, logger
+from glances.core.glances_globals import is_mac, is_windows
+from glances.core.glances_logging import logger
 from glances.core.glances_logs import glances_logs
 from glances.core.glances_processes import glances_processes
 from glances.core.glances_timer import Timer
diff --git a/glances/outputs/glances_history.py b/glances/outputs/glances_history.py
index 27d9f10a..36217897 100644
--- a/glances/outputs/glances_history.py
+++ b/glances/outputs/glances_history.py
@@ -23,7 +23,7 @@
 import os
 
 # Import Glances lib
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 
 # Import specific lib
 try:
diff --git a/glances/plugins/glances_batpercent.py b/glances/plugins/glances_batpercent.py
index 0a689eaa..f5d67fda 100644
--- a/glances/plugins/glances_batpercent.py
+++ b/glances/plugins/glances_batpercent.py
@@ -20,7 +20,7 @@
 """Battery plugin."""
 
 # Import Glances libs
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 from glances.plugins.glances_plugin import GlancesPlugin
 
 # Batinfo library (optional; Linux-only)
diff --git a/glances/plugins/glances_monitor.py b/glances/plugins/glances_monitor.py
index 57396d05..16d548ae 100644
--- a/glances/plugins/glances_monitor.py
+++ b/glances/plugins/glances_monitor.py
@@ -20,7 +20,7 @@
 """Monitor plugin."""
 
 # Import Glances lib
-from glances.core.glances_globals import logger
+from glances.core.glances_logging import logger
 from glances.core.glances_monitor_list import MonitorList as glancesMonitorList
 from glances.plugins.glances_plugin import GlancesPlugin
 
diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py
index 5a65e7c6..09e76707 100644
--- a/glances/plugins/glances_plugin.py
+++ b/glances/plugins/glances_plugin.py
@@ -29,7 +29,8 @@ from datetime import datetime
 from operator import itemgetter
 
 # Import Glances lib
-from glances.core.glances_globals import is_py3, logger
+from glances.core.glances_globals import is_py3
+from glances.core.glances_logging import logger
 from glances.core.glances_logs import glances_logs
 
 
diff --git a/glances/plugins/glances_sensors.py b/glances/plugins/glances_sensors.py
index c1555aac..5fe7fddc 100644
--- a/glances/plugins/glances_sensors.py
+++ b/glances/plugins/glances_sensors.py
@@ -27,7 +27,8 @@ except ImportError:
     pass
 
 # Import Glances lib
-from glances.core.glances_globals import is_py3, logger
+from glances.core.glances_globals import is_py3
+from glances.core.glances_logging import logger
 from glances.plugins.glances_batpercent import Plugin as BatPercentPlugin
 from glances.plugins.glances_hddtemp import Plugin as HddTempPlugin
 from glances.plugins.glances_plugin import GlancesPlugin