You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 17:43:14 UTC
[12/50] lager commit: updated refs/heads/import-master to da4419e
Update to goldrush 0.1.5
Project: http://git-wip-us.apache.org/repos/asf/couchdb-lager/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-lager/commit/b2971040
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-lager/tree/b2971040
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-lager/diff/b2971040
Branch: refs/heads/import-master
Commit: b29710406ecc06e996831e636d0b302196095d0a
Parents: 019354b
Author: Andrew Thompson <an...@hijacked.us>
Authored: Fri Nov 8 15:57:04 2013 -0500
Committer: Andrew Thompson <an...@hijacked.us>
Committed: Fri Nov 8 15:57:04 2013 -0500
----------------------------------------------------------------------
rebar.config | 2 +-
src/lager.app.src | 4 ++--
test/lager_test_backend.erl | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-lager/blob/b2971040/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 6809cbb..5fc1896 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
{erl_first_files, ["src/lager_util.erl"]}.
{deps, [
{goldrush, ".*",
- {git, "git://github.com/DeadZen/goldrush.git", {tag, "879c69874a"}}}
+ {git, "git://github.com/DeadZen/goldrush.git", {tag, "0.1.5"}}}
]}.
{cover_enabled, true}.
http://git-wip-us.apache.org/repos/asf/couchdb-lager/blob/b2971040/src/lager.app.src
----------------------------------------------------------------------
diff --git a/src/lager.app.src b/src/lager.app.src
index 63f35ce..4c7ec71 100644
--- a/src/lager.app.src
+++ b/src/lager.app.src
@@ -7,10 +7,10 @@
{modules, []},
{applications, [
kernel,
- stdlib
+ stdlib,
+ goldrush
]},
{registered, [lager_sup, lager_event, lager_crash_log, lager_handler_watcher_sup]},
- {included_applications, [goldrush]},
{mod, {lager_app, []}},
{env, [
%% What handlers to install with what arguments
http://git-wip-us.apache.org/repos/asf/couchdb-lager/blob/b2971040/test/lager_test_backend.erl
----------------------------------------------------------------------
diff --git a/test/lager_test_backend.erl b/test/lager_test_backend.erl
index 59590ba..ce43020 100644
--- a/test/lager_test_backend.erl
+++ b/test/lager_test_backend.erl
@@ -109,7 +109,7 @@ print_bad_state() ->
has_line_numbers() ->
%% are we R15 or greater
Rel = erlang:system_info(otp_release),
- {match, [Major]} = re:run(Rel, "^R(\\d+)[A|B](|0(\\d))$", [{capture, [1], list}]),
+ {match, [Major]} = re:run(Rel, "^R(\\d+)[A|B](|0(\\d))", [{capture, [1], list}]),
list_to_integer(Major) >= 15.
not_running_test() ->
@@ -555,7 +555,7 @@ setup() ->
application:load(lager),
application:set_env(lager, handlers, [{?MODULE, info}]),
application:set_env(lager, error_logger_redirect, false),
- application:start(lager),
+ lager:start(),
gen_event:call(lager_event, ?MODULE, flush).
cleanup(_) ->