Merge pull request #26717 from basepi/revert.loader.changes.26645

[2015.8] Revert loader changes from #26645

salt/loader.py

@@ -450,10 +450,6 @@ def log_handlers(opts):
 
     :param dict opts: The Salt options dictionary
     '''
-    pack = {
-        '__grains__': grains(opts),
-        '__salt__': minion_mods(opts)
-    }
     ret = LazyLoader(_module_dirs(opts,
                                   'log_handlers',
                                   'log_handlers',
@@ -461,7 +457,6 @@ def log_handlers(opts):
                                   base_path=os.path.join(SALT_BASE_PATH, 'log')),
                      opts,
                      tag='log_handlers',
-                     pack=pack
                      )
     return FilterDictWrapper(ret, '.setup_handlers')
 

salt/log/handlers/sentry_mod.py

@@ -81,6 +81,7 @@ from __future__ import absolute_import
 import logging
 
 # Import salt libs
+import salt.loader
 from salt.log import LOG_LEVELS
 
 # Import 3rd party libs
@@ -92,6 +93,8 @@ except ImportError:
     HAS_RAVEN = False
 
 log = logging.getLogger(__name__)
+__grains__ = salt.loader.grains(__opts__)
+__salt__ = salt.loader.minion_mods(__opts__)
 
 # Define the module's virtual name
 __virtualname__ = 'sentry'