[03/50] couchdb commit: updated refs/heads/master to 6526051

[rn...@apache.org]

Replace twig with couch_log


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/35f3fbe0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/35f3fbe0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/35f3fbe0

Branch: refs/heads/master
Commit: 35f3fbe09f34dd2e6b8d180a31103ad183b0f35d
Parents: 1a2d250
Author: Robert Newson <rn...@apache.org>
Authored: Wed Feb 12 11:58:29 2014 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Feb 12 22:31:57 2014 +0000

----------------------------------------------------------------------
 .gitignore                     |  1 +
 etc/couchdb/default.ini.tpl.in |  1 -
 etc/couchdb/local.ini          | 10 ----------
 rebar.config.script            |  4 ++--
 rel/reltool.config             |  4 ++--
 5 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 29b3732..f7d746d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ rel/*.config
 rel/dev*
 rel/tmpdata
 src/
+/log
 
 *.o
 *.so

http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 9d9465e..8ff76d5 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -157,7 +157,6 @@ _replicate = {couch_replicator_httpd, handle_req}
 _uuids = {couch_httpd_misc_handlers, handle_uuids_req}
 _restart = {couch_httpd_misc_handlers, handle_restart_req}
 _stats = {couch_httpd_stats_handlers, handle_stats_req}
-_log = {couch_httpd_misc_handlers, handle_log_req}
 _session = {couch_httpd_auth, handle_session_req}
 _oauth = {couch_httpd_oauth, handle_oauth_req}
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/etc/couchdb/local.ini
----------------------------------------------------------------------
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
index a5db26f..ab671e1 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -34,16 +34,6 @@
 ; Basic realm="server" in order to prevent you getting logged out.
 ; require_valid_user = false
 
-[log]
-;level = debug
-
-[log_level_by_module]
-; In this section you can specify any of the four log levels 'none', 'info',
-; 'error' or 'debug' on a per-module basis. See src/*/*.erl for various
-; modules.
-;couch_httpd = error
-
-
 [os_daemons]
 ; For any commands listed here, CouchDB will attempt to ensure that
 ; the process remains alive. Daemons should monitor their environment

http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 9eae809..6e7ff75 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,6 +17,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
 
 
 DepDescs = [
+    {couch_log, "couchdb-couch-log", {branch, "1843-feature-bigcouch"}},
     {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
     {config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
     {couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
@@ -32,8 +33,7 @@ DepDescs = [
     {mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
     {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
     {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
-    {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}},
-    {twig, "couchdb-twig", {branch, "1843-feature-bigcouch"}}
+    {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
 ],
 
 MakeDep = fun({AppName, RepoName, Version}) ->

http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 476dca6..331e2b1 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -33,7 +33,7 @@
         snappy,
         ssl,
         stdlib,
-        twig,
+        couch_log,
         xmerl
     ]},
     {rel, "start_clean", "", [kernel, stdlib]},
@@ -55,7 +55,7 @@
     {app, mem3, [{incl_cond, include}]},
     {app, rexi, [{incl_cond, include}]},
     {app, snappy, [{incl_cond, include}]},
-    {app, twig, [{incl_cond, include}]}
+    {app, couch_log, [{incl_cond, include}]}
 ]}.
 
 {overlay_vars, "couchdb.config"}.