From a201888fdec73c4bcacfdd2f0a6f3ad96449e6a9 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Jul 2012 19:02:36 +0200
Subject: [PATCH] Make logging format configurable (closes #4)

NOTE: the default format for the "test" environment is without
ansi colors, to be easier on remote terminal sessions
---
 config/environments/development.js.example | 1 +
 config/environments/production.js.example  | 1 +
 config/environments/staging.js.example     | 1 +
 config/environments/test.js.example        | 1 +
 lib/cartodb/server_options.js              | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 9ed0731f..8e6c1f77 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -4,6 +4,7 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: false
+    ,log_format: '[:date] :req[X-Real-IP] \033[90m:method\033[0m \033[36m:req[Host]:url\033[0m \033[90m:status :response-time ms -> :res[Content-Type]\033[0m'
     ,postgres_auth_user: 'development_cartodb_user_<%= user_id %>'
     ,postgres: {
         type: "postgis",
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 15a3c9bc..1198afd5 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -4,6 +4,7 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: true
+    ,log_format: '[:date] :req[X-Real-IP] \033[90m:method\033[0m \033[36m:req[Host]:url\033[0m \033[90m:status :response-time ms -> :res[Content-Type]\033[0m'
     ,postgres_auth_user: 'cartodb_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index c96bb78a..707b2a70 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -4,6 +4,7 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: true
+    ,log_format: '[:date] :req[X-Real-IP] \033[90m:method\033[0m \033[36m:req[Host]:url\033[0m \033[90m:status :response-time ms -> :res[Content-Type]\033[0m'
     ,postgres_auth_user: 'cartodb_staging_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 3b8f27f3..2d6d4891 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -4,6 +4,7 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: false
+    ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type]'
     ,postgres_auth_user: 'test_cartodb_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 183d7cae..5761a776 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -15,7 +15,7 @@ module.exports = function(){
         varnish_host: global.environment.varnish.host,
         varnish_port: global.environment.varnish.port,
         cache_enabled: global.environment.cache_enabled,
-        log_format: '[:date] :req[X-Real-IP] \033[90m:method\033[0m \033[36m:req[Host]:url\033[0m \033[90m:status :response-time ms -> :res[Content-Type]\033[0m'
+        log_format: global.environment.log_format
     };
 
     // Set the cache chanel info to invalidate the cache on the frontend server