@@ -64,6 +64,7 @@ %%---------------------------------------------------------------------- %% Helper macros %%---------------------------------------------------------------------- +-define(EWGI_LOGGER_NAME, smak_logger). -define(EWGI_LOGGER_KEY, '_smak_logger'). -define(CTX_LOG(Ctx, L, F, A), case ewgi_api:find_data(?EWGI_LOGGER_KEY, Ctx) of include/smak.hrl @@ -12,6 +12,7 @@ -module(smak_log). -author('Hunter Morris <hunter.morris@smarkets.com>'). +-export([start_link/0, start_link/1]). -export([init/1, level_compare/2]). -include("smak.hrl"). @@ -19,12 +20,22 @@ %% @type sl_option() = {name, atom()} -type sl_option() :: {'name', atom()}. +-type start_result() :: {'ok', pid()} | {error, {'already_started', pid()}} | {error, any()}. + +-spec start_link() -> start_result(). +start_link() -> + start_link({local, ?EWGI_LOGGER_NAME}). + +-spec start_link({'local', atom()} | {'global', atom()}) -> start_result(). +start_link(Name) -> + gen_event:start_link(Name). + %% @spec init(Options::[sl_option()]) -> ewgi_app() %% @doc Initialises the logging middleware which provides a function %% for logging from an application. -spec init([sl_option()]) -> ewgi_app(). init(Options) when is_list(Options) -> - Name = proplists:get_value(name, Options, ?EWGI_LOGGER_KEY), + Name = proplists:get_value(name, Options, ?EWGI_LOGGER_NAME), F = fun(Ctx0) -> ewgi_api:store_data(?EWGI_LOGGER_KEY, log_event(Name), Ctx0) end, src/smak_log.erl @@ -15,7 +15,7 @@ -author('Hunter Morris <hunter.morris@smarkets.com>'). -behaviour(gen_event). --export([add/2, delete/1]). +-export([add/1, add/2, delete/0, delete/1]). -export([init/1, handle_event/2, terminate/2, code_change/3, handle_call/2, handle_info/2]). -include("smak.hrl"). @@ -26,10 +26,18 @@ level :: log_level() }). --spec add(atom(), [slc_option()]) -> ok. +-spec add([slc_option()]) -> 'ok'. +add(Options) -> + add(?EWGI_LOGGER_NAME, Options). + +-spec add(atom(), [slc_option()]) -> 'ok'. add(Name, Options) -> gen_event:add_handler(Name, ?MODULE, Options). +-spec delete() -> 'ok'. +delete() -> + delete(?EWGI_LOGGER_NAME). + -spec delete(atom()) -> 'ok'. delete(Name) -> gen_event:delete_handler(Name, ?MODULE, []). src/smak_log_console.erl @@ -15,7 +15,7 @@ -author('Hunter Morris <hunter.morris@smarkets.com>'). -behaviour(gen_event). --export([add/2, delete/1]). +-export([add/1, add/2, delete/0, delete/1]). -export([init/1, handle_event/2, terminate/2, code_change/3, handle_call/2, handle_info/2]). -include("smak.hrl"). @@ -27,10 +27,18 @@ level :: log_level() }). --spec add(atom(), [slf_option()]) -> ok. +-spec add([slf_option()]) -> 'ok'. +add(Options) -> + add(?EWGI_LOGGER_NAME, Options). + +-spec add(atom(), [slf_option()]) -> 'ok'. add(Name, Options) -> gen_event:add_handler(Name, ?MODULE, Options). +-spec delete() -> 'ok'. +delete() -> + delete(?EWGI_LOGGER_NAME). + -spec delete(atom()) -> 'ok'. delete(Name) -> gen_event:delete_handler(Name, ?MODULE, []). src/smak_log_file.erl 47eaf1f9298f9fe5c67d029e822c095cd11209fe Hunter Morris huntermorris@gmail.com http://github.com/skarab/smak/commit/ab4d7bb3cdc81ee11677769c68b01902c3cdeeda ab4d7bb3cdc81ee11677769c68b01902c3cdeeda 2009-03-11T18:39:28-07:00 2009-03-11T18:39:28-07:00 Fixed logging so that default logger name and EWGI data keys are separate b93a7f7a14b308d182c645bd444ac5dcba42bf47 Hunter Morris huntermorris@gmail.com