diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-11-01 22:23:01 +0900 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-11-01 22:23:01 +0900 |
| commit | 195d22d906c5f2197224556cf45dac0885b5f3c8 (patch) | |
| tree | ac8b55d136e05db007d787c7991ebbbb335aad1a /src | |
| parent | Do not run set_last request inside a transaction (diff) | |
| parent | Fix errors in EDoc comments (diff) | |
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_loglevel.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ejabberd_loglevel.erl b/src/ejabberd_loglevel.erl index 0e033324d..b2cb9c346 100644 --- a/src/ejabberd_loglevel.erl +++ b/src/ejabberd_loglevel.erl @@ -64,7 +64,7 @@ %% @type level() = integer() | atom(). -%% @spec () -> [LevelOrdinal::integer(), [{Module::atom(), LevelOrdinal::integer()}]] +%% @spec () -> {DefaultLevelOrdinal::integer(), [{Module::atom(), LevelOrdinal::integer()}]} %% @doc Get the default and all custom levels get() -> {DefaultLevel, _CustomLevels} = ejabberd_logger:get(), @@ -75,7 +75,7 @@ get() -> erlang:error({no_such_loglevel, DefaultLevel}) end. -%% @spec (DefaultLevel::level() | {DefaultLevel::level(), [{Module::atom(), Level::level()]}) -> +%% @spec (DefaultLevel::level() | {DefaultLevel::level(), [{Module::atom(), Level::level()}]}) -> %% {module, ejabberd_logger} %% @doc Set the default and all custom levels set(DefaultLevel) when is_atom(DefaultLevel) orelse is_integer(DefaultLevel) -> @@ -93,7 +93,7 @@ set({DefaultLevel, CustomLevels}) when is_list(CustomLevels) -> set(_) -> exit("Invalid loglevel format"). -%% @spec (Module::atom()::atom(), CustomLevel::level()) -> ok +%% @spec (Module::atom(), CustomLevel::level()) -> ok %% @doc Set a custom level set_custom(Module, Level) -> {DefaultLevel, CustomLevels} = ejabberd_logger:get(), |