From 863c6b1154e5cc2a5f15a51ed5cc1aeac263bd66 Mon Sep 17 00:00:00 2001
From: aheadley <aheadley@nexcess.net>
Date: Thu, 22 Mar 2012 17:32:28 -0400
Subject: [PATCH] make observer a setting, need to update docs

---
 overviewer.py                         | 6 +-----
 overviewer_core/settingsDefinition.py | 8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/overviewer.py b/overviewer.py
index c87d3ef..12bc6ee 100755
--- a/overviewer.py
+++ b/overviewer.py
@@ -397,11 +397,7 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
     else:
         dispatch = dispatcher.MultiprocessingDispatcher(
             local_procs=config['processes'])
-    if platform.system() == 'Windows' or not sys.stderr.isatty():
-        obs = observer.LoggingObserver()
-    else:
-        obs = observer.ProgressBarObserver()
-    dispatch.render_all(tilesets, obs)
+    dispatch.render_all(tilesets, config['observer'])
     dispatch.close()
 
     assetMrg.finalize(tilesets)
diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py
index 5773dd2..122592f 100644
--- a/overviewer_core/settingsDefinition.py
+++ b/overviewer_core/settingsDefinition.py
@@ -45,6 +45,7 @@
 
 from settingsValidators import *
 import util
+from observer import ProgressBarObserver, LoggingObserver
 
 # renders is a dictionary mapping strings to dicts. These dicts describe the
 # configuration for that render. Therefore, the validator for 'renders' is set
@@ -76,7 +77,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
             "crop": Setting(required=False, validator=validateCrop, default=None),
             "changelist": Setting(required=False, validator=validateStr, default=None),
             "markers": Setting(required=False, validator=validateMarkers, default=[]),
-            
+
             # Remove this eventually (once people update their configs)
             "worldname": Setting(required=False, default=None,
                 validator=error("The option 'worldname' is now called 'world'. Please update your config files")),
@@ -93,3 +94,8 @@ processes = Setting(required=True, validator=int, default=-1)
 # memcached is an option, but unless your IO costs are really high, it just
 # ends up adding overhead and isn't worth it.
 memcached_host = Setting(required=False, validator=str, default=None)
+
+if platform.system() == 'Windows' or not sys.stderr.isatty():
+    observer = LoggingObserver()
+else:
+    observer = ProgressBarObserver()