From 67015f3316ecc7906d7ca6e330f924de366c0679 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Thu, 20 Apr 2017 23:48:56 +0100
Subject: [PATCH] Fix up default logging levels.

---
 volatility/cli/__init__.py       | 13 ++++++-------
 volatility/framework/__init__.py |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/volatility/cli/__init__.py b/volatility/cli/__init__.py
index 1aa05dc0c..ad4e8d277 100644
--- a/volatility/cli/__init__.py
+++ b/volatility/cli/__init__.py
@@ -16,8 +16,7 @@ import sys
 
 import volatility.framework
 import volatility.plugins
-from volatility.framework import automagic
-from volatility.framework import constants, contexts, interfaces
+from volatility.framework import automagic, constants, contexts, interfaces
 from volatility.framework.configuration import requirements
 from volatility.framework.interfaces.configuration import HierarchicalDict
 from volatility.framework.renderers.text import QuickTextRenderer
@@ -29,14 +28,14 @@ logging.basicConfig(filename = 'example.log',
                     format = '%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                     datefmt = '%m-%d %H:%M',
                     level = 0)
-vollog = logging.getLogger("volatility")
+vollog = logging.getLogger()
 console = logging.StreamHandler()
 # Trim the console down by default
-console.setLevel(logging.DEBUG)
+console.setLevel(logging.WARNING)
 formatter = logging.Formatter('%(levelname)-8s %(name)-12s: %(message)s')
 console.setFormatter(formatter)
 
-logging.getLogger("").addHandler(console)
+vollog.addHandler(console)
 
 
 class CommandLine(object):
@@ -53,7 +52,7 @@ class CommandLine(object):
 
         # Do the initialization
         ctx = contexts.Context()  # Construct a blank context
-        volatility.framework.import_files(volatility.plugins)
+        volatility.framework.import_files(volatility.plugins)  # Will not log as console's default level is WARNING
         automagics = automagic.available(ctx)
 
         plugin_list = {}
@@ -94,7 +93,7 @@ class CommandLine(object):
         args = parser.parse_args()
         if args.plugin is None:
             parser.error("Please select a plugin to run")
-        console.setLevel(10 - min(3, args.verbosity))
+        console.setLevel(30 - (args.verbosity * 10))
 
         plugin = plugin_list[args.plugin]
         plugin_config_path = interfaces.configuration.path_join('plugins', plugin.__name__)
diff --git a/volatility/framework/__init__.py b/volatility/framework/__init__.py
index 01b1096fe..be5ed513f 100644
--- a/volatility/framework/__init__.py
+++ b/volatility/framework/__init__.py
@@ -23,7 +23,7 @@ CURRENT = 0  # Number of releases of the library with any change
 REVISION = 0  # Number of changes that don't affect the interface
 AGE = 0  # Number of consecutive versions of the interface the current version supports
 
-vollog = logging.getLogger("volatility")
+vollog = logging.getLogger(__name__)
 
 
 def interface_version():