Skip to content

Commit

Permalink
Merge pull request #550 from guillermooo-forks/refactor-logging
Browse files Browse the repository at this point in the history
Refactor logging
  • Loading branch information
guillermooo committed Jul 6, 2015
2 parents 30b065f + 7431980 commit aa1f9fa
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 17 deletions.
15 changes: 3 additions & 12 deletions __init__.py
@@ -1,12 +1,3 @@
from Dart.sublime_plugin_lib import PluginLogger

from Dart.lib.editor_context import EditorContext

import logging


_logger = PluginLogger(__name__)
_logger.warn_aboug_logging_level()


editor_context = EditorContext()
# !! WARNING !!
# Don't put any code here, because Sublime Text will load this file twice and
# it may cause unexpected behavior. Use _init_.py instead.
12 changes: 12 additions & 0 deletions _init_.py
@@ -0,0 +1,12 @@
from Dart.sublime_plugin_lib import PluginLogger

from Dart.lib.editor_context import EditorContext

import logging


_logger = PluginLogger('Dart')
_logger.warn_aboug_logging_level()


editor_context = EditorContext()
2 changes: 1 addition & 1 deletion analyzer.py
Expand Up @@ -21,7 +21,7 @@
from Dart.sublime_plugin_lib.plat import supress_window
from Dart.sublime_plugin_lib.sublime import after

from Dart import editor_context
from Dart._init_ import editor_context
from Dart.lib.analyzer import actions
from Dart.lib.analyzer import requests
from Dart.lib.analyzer.api.base import Notification
Expand Down
2 changes: 1 addition & 1 deletion autocomplete.py
Expand Up @@ -8,7 +8,7 @@
from Dart.sublime_plugin_lib.path import is_active

from Dart import analyzer
from Dart import editor_context
from Dart._init_ import editor_context
from Dart.analyzer import AnalysisServer
from Dart.lib.path import is_view_dart_script
from Dart.lib.pub_package import DartFile
Expand Down
2 changes: 1 addition & 1 deletion lib/analyzer/actions.py
Expand Up @@ -18,7 +18,7 @@
from Dart.lib.analyzer.api.protocol import AnalysisErrorSeverity
from Dart.lib.analyzer.api.protocol import AnalysisErrorType
from Dart.lib.analyzer.api.protocol import ElementKind
from Dart import editor_context
from Dart._init_ import editor_context


_logger = PluginLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion lib/analyzer/response.py
Expand Up @@ -11,7 +11,7 @@

from Dart.sublime_plugin_lib import PluginLogger

from Dart import editor_context
from Dart._init_ import editor_context
from Dart.lib.analyzer.api.protocol import AnalysisErrorsParams
from Dart.lib.analyzer.api.protocol import ServerGetVersionResult
from Dart.lib.analyzer.api.protocol import AnalysisNavigationParams
Expand Down
2 changes: 1 addition & 1 deletion navigation.py
Expand Up @@ -3,7 +3,7 @@
import sublime
import sublime_plugin

from Dart import editor_context
from Dart._init_ import editor_context
from Dart.lib.notifications import show_analysis_tooltip
from Dart.lib.notifications import show_status_tooltip

Expand Down
5 changes: 5 additions & 0 deletions sublime_plugin_lib/__init__.py
Expand Up @@ -99,6 +99,11 @@ class PluginLogger(object):

def __init__(self, name):
self.logger = logging.getLogger(name)

# Only attach handlers to the top-level logger in the hierarchy.
if '.' in name:
return

default_level = logging.ERROR
user_level = self._get_log_level_from_file()
self.logger.setLevel(user_level if user_level is not None else default_level)
Expand Down

0 comments on commit aa1f9fa

Please sign in to comment.