couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [3/5] couchdb commit: updated refs/heads/master to 7b3f5d0
Date Fri, 22 Jul 2016 10:04:29 GMT
Remove lager and its dependencies

COUCHDB-3067


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

Branch: refs/heads/master
Commit: 7777595015b8160ba43c17a4452f56e109b9565a
Parents: bdb68b9
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Fri Jul 22 04:52:28 2016 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Fri Jul 22 05:04:09 2016 -0500

----------------------------------------------------------------------
 Makefile               |  2 +-
 Makefile.win           |  2 +-
 configure              |  2 --
 rebar.config.script    |  4 +---
 rel/files/eunit.config | 21 +--------------------
 rel/files/sys.config   | 19 +------------------
 rel/reltool.config     |  6 ------
 7 files changed, 5 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2c9075b..c3f0745 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ DESTDIR=
 
 # Rebar options
 apps=
-skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+skip_deps=folsom,meck,mochiweb,proper,snappy
 suites=
 tests=
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/Makefile.win
----------------------------------------------------------------------
diff --git a/Makefile.win b/Makefile.win
index 83d88fa..168b2ff 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -25,7 +25,7 @@ DESTDIR=
 
 # Rebar options
 apps=
-skip_deps=folsom,lager,meck,mochiweb,proper,snappy
+skip_deps=folsom,meck,mochiweb,proper,snappy
 suites=
 tests=
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 1a7677a..74c5787 100755
--- a/configure
+++ b/configure
@@ -208,8 +208,6 @@ EOF
 
 cat > $rootdir/config.erl << EOF
 {with_curl, $WITH_CURL}.
-{couch_log_backend, couch_log_lager}.
-{couch_log_backend_apps, {list, [couch_log_lager]}}.
 EOF
 
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 1cdc9fd..f92be36 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,8 +27,7 @@ DepDescs = [
 {config,           "config",           "60977f81dc06af4a3d1e89891b3061ed4cd01e95"},
 %% keep these sorted
 {b64url,           "b64url",           "6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log,        "couch-log",        "cc5540419e0a4bb7872d18bc5a94f39446d83a88"},
-{couch_log_lager,  "couch-log-lager",  "a7a8b7efb8855a8b0cf9612eeca7c190c414bbfb"},
+{couch_log,        "couch-log",        {branch, "3067-improve-couch-log"}},
 {chttpd,           "chttpd",           "5e3bf1f5e2e96841ce0d2b26606c7f590c067bdc"},
 {couch,            "couch",            "ac3dae37da1e44dfba6fbed8ec11fa1c6779ee33"},
 {couch_index,      "couch-index",      "e7d269800302224eacf9585f74eb30822495755b"},
@@ -46,7 +45,6 @@ DepDescs = [
 {fauxton,          "fauxton",          {tag, "v1.1.5"}, [raw]},
 {folsom,           "folsom",           "a5c95dec18227c977029fbd3b638966d98f17003"},
 {global_changes,   "global-changes",   "203fb088ed81149108e64d18ffd9c3f5df154f97"},
-{goldrush,         "goldrush",         {tag, "0.1.6"}},
 {ibrowse,          "ibrowse",          "4af2d408607874d124414ac45df1edbe3961d1cd"},
 {ioq,              "ioq",              "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
 {jiffy,            "jiffy",            "d3c00e19d8fa20c21758402231247602190988d3"},

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/files/eunit.config
----------------------------------------------------------------------
diff --git a/rel/files/eunit.config b/rel/files/eunit.config
index 3ed74c0..97562f5 100644
--- a/rel/files/eunit.config
+++ b/rel/files/eunit.config
@@ -10,23 +10,4 @@
 % License for the specific language governing permissions and limitations under
 % the License.
 
-[
-    {kernel, [{error_logger, silent}]},
-    {sasl, [{sasl_error_logger, false}]},
-    {lager, [
-        {error_logger_hwm, 1000},
-        {error_logger_redirect, true},
-        {handlers, [
-            {lager_console_backend, [error, {
-                lager_default_formatter,
-                [
-                    date, " ", time,
-                    " [", severity, "] ",
-                    node, " ", pid, " ",
-                    message,
-                    "\n"
-                ]
-            }]}
-        ]}
-    ]}
-].
+[].

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/rel/files/sys.config b/rel/files/sys.config
index 9c2142d..97562f5 100644
--- a/rel/files/sys.config
+++ b/rel/files/sys.config
@@ -10,21 +10,4 @@
 % License for the specific language governing permissions and limitations under
 % the License.
 
-[
-    {lager, [
-        {error_logger_hwm, 1000},
-        {error_logger_redirect, true},
-        {handlers, [
-            {lager_console_backend, [info, {
-                lager_default_formatter,
-                [
-                    date, " ", time,
-                    " [", severity, "] ",
-                    node, " ", pid, " ",
-                    message,
-                    "\n"
-                ]
-            }]}
-        ]}
-    ]}
-].
+[].

http://git-wip-us.apache.org/repos/asf/couchdb/blob/77775950/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 4c990a8..9c1f67f 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -35,7 +35,6 @@
         couch_epi,
         couch_index,
         couch_log,
-        couch_log_lager,
         couch_mrview,
         couch_plugins,
         couch_replicator,
@@ -47,12 +46,10 @@
         fabric,
         folsom,
         global_changes,
-        goldrush,
         ibrowse,
         ioq,
         jiffy,
         khash,
-        lager,
         mango,
         mem3,
         mochiweb,
@@ -92,7 +89,6 @@
     {app, couch_epi, [{incl_cond, include}]},
     {app, couch_index, [{incl_cond, include}]},
     {app, couch_log, [{incl_cond, include}]},
-    {app, couch_log_lager, [{incl_cond, include}]},
     {app, couch_mrview, [{incl_cond, include}]},
     {app, couch_plugins, [{incl_cond, include}]},
     {app, couch_replicator, [{incl_cond, include}]},
@@ -104,12 +100,10 @@
     {app, fabric, [{incl_cond, include}]},
     {app, folsom, [{incl_cond, include}]},
     {app, global_changes, [{incl_cond, include}]},
-    {app, goldrush, [{incl_cond, include}]},
     {app, ibrowse, [{incl_cond, include}]},
     {app, ioq, [{incl_cond, include}]},
     {app, jiffy, [{incl_cond, include}]},
     {app, khash, [{incl_cond, include}]},
-    {app, lager, [{incl_cond, include}]},
     {app, mango, [{incl_cond, include}]},
     {app, mem3, [{incl_cond, include}]},
     {app, mochiweb, [{incl_cond, include}]},


Mime
View raw message