From d373d257e3b23f27a1dfc699383ef4b469cc66c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 29 Oct 2015 14:52:14 +0100
Subject: [PATCH] Slight changes on logging verbosity

Changed the intensity of logged warnings and ensured everything
but the octoprint package's log level to be WARN be default.
---
 src/octoprint/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/__init__.py b/src/octoprint/__init__.py
index e21664a7..fb98ca0d 100644
--- a/src/octoprint/__init__.py
+++ b/src/octoprint/__init__.py
@@ -108,13 +108,14 @@ def init_logging(settings, use_logging_file=True, logging_file=None, default_con
 				}
 			},
 			"root": {
-				"level": "INFO",
+				"level": "WARN",
 				"handlers": ["console", "file"]
 			}
 		}
 
 	if debug or verbosity > 0:
 		default_config["loggers"]["octoprint"]["level"] = "DEBUG"
+		default_config["root"]["level"] = "INFO"
 	if verbosity > 1:
 		default_config["loggers"]["octoprint.plugins"]["level"] = "DEBUG"
 	if verbosity > 2:
@@ -145,10 +146,12 @@ def init_logging(settings, use_logging_file=True, logging_file=None, default_con
 
 	import warnings
 
+	categories = (DeprecationWarning, PendingDeprecationWarning)
 	if verbosity > 2:
 		warnings.simplefilter("always")
 	elif debug or verbosity > 0:
-		warnings.simplefilter("default")
+		for category in categories:
+			warnings.simplefilter("always", category=category)
 
 	# make sure we also log any uncaught exceptions
 	if uncaught_logger is None: