From 7be15d6334449f4fb3d720ab4f47bddef754afd0 Mon Sep 17 00:00:00 2001
From: Collin Anderson <cmawebsite@gmail.com>
Date: Tue, 16 Sep 2014 10:15:17 -0400
Subject: [PATCH] Log to console by default. #832

Version 19 removed any logging by default. This logs everything to the
console by default.
---
 docs/site/index.html      |  2 +-
 docs/source/2014-news.rst | 16 ++++++++++++++++
 docs/source/faq.rst       |  5 +++--
 docs/source/news.rst      | 16 ++++++++++++++++
 docs/source/settings.rst  |  5 ++++-
 gunicorn/config.py        |  2 +-
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/docs/site/index.html b/docs/site/index.html
index 175c4e43..c42a8c66 100644
--- a/docs/site/index.html
+++ b/docs/site/index.html
@@ -90,7 +90,7 @@
       ])
       return iter([data])
 
-  (tutorial) $ ../bin/gunicorn --log-file - -w 4 myapp:app
+  (tutorial) $ ../bin/gunicorn -w 4 myapp:app
   [2014-09-10 10:22:28 +0000] [30869] [INFO] Listening at: http://127.0.0.1:8000 (30869)
   [2014-09-10 10:22:28 +0000] [30869] [INFO] Using worker: sync
   [2014-09-10 10:22:28 +0000] [30874] [INFO] Booting worker with pid: 30874
diff --git a/docs/source/2014-news.rst b/docs/source/2014-news.rst
index 01370aa8..77c59d8f 100644
--- a/docs/source/2014-news.rst
+++ b/docs/source/2014-news.rst
@@ -1,6 +1,22 @@
 Changelog - 2014
 ================
 
+20.0 / unreleased
+-----------------
+
+Changes
+-------
+
+Core
+++++
+
+- fix `#863 <https://github.com/benoitc/gunicorn/issues/863`_: fix race condition error.
+
+Logging
++++++++
+
+- fix `#832 <https://github.com/benoitc/gunicorn/issues/835>`_: log to console by default.
+
 19.1.1 / 2014-08-16
 -------------------
 
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index 9af09268..3e3d75fd 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -100,8 +100,9 @@ to remove this issue.
 Why I don't see any logs in the console?
 ----------------------------------------
 
-Since the version R19, Gunicorn doesn't log by default in the console.
-To watch the logs  in the console you now need to use the option ``--log-file=-``.
+In version R19, Gunicorn doesn't log by default in the console.
+To watch the logs in the console you need to use the option ``--log-file=-``.
+In version R20, Gunicorn logs to the console by default again.
 
 Kernel Parameters
 =================
diff --git a/docs/source/news.rst b/docs/source/news.rst
index 7d36c65c..c56f435c 100644
--- a/docs/source/news.rst
+++ b/docs/source/news.rst
@@ -1,6 +1,22 @@
 Changelog
 =========
 
+20.0 / unreleased
+-----------------
+
+Changes
+-------
+
+Core
+++++
+
+- fix `#863 <https://github.com/benoitc/gunicorn/issues/863`_: fix race condition error.
+
+Logging
++++++++
+
+- fix `#832 <https://github.com/benoitc/gunicorn/issues/832`_: log to console by default.
+
 19.1.1 / 2014-08-16
 -------------------
 
diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 3de61854..a29997e0 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -469,12 +469,15 @@ errorlog
 ~~~~~~~~
 
 * ``--error-logfile FILE, --log-file FILE``
-* ``None``
+* ``-``
 
 The Error log file to write to.
 
 "-" means log to stderr.
 
+.. versionchanged:: 20.0
+   Log to ``stderr`` by default.
+
 loglevel
 ~~~~~~~~
 
diff --git a/gunicorn/config.py b/gunicorn/config.py
index 40d8fbd5..768bd8e4 100644
--- a/gunicorn/config.py
+++ b/gunicorn/config.py
@@ -1045,7 +1045,7 @@ class ErrorLog(Setting):
     cli = ["--error-logfile", "--log-file"]
     meta = "FILE"
     validator = validate_string
-    default = None
+    default = '-'
     desc = """\
         The Error log file to write to.