diff options
author | Alexey Shchepin <alexey@process-one.net> | 2004-04-15 19:55:38 +0000 |
---|---|---|
committer | Alexey Shchepin <alexey@process-one.net> | 2004-04-15 19:55:38 +0000 |
commit | b542249f115761b97d21d9528d6100aaa84ea9d7 (patch) | |
tree | 41cd148ea5944fd53193f2ae93c271ae29ff1a19 /src/ejabberd_app.erl | |
parent | * src/idna.erl: Support for IDNA (RFC3490) (diff) |
* src/ejabberd.erl: Added searching of files in code:priv_lib
(thanks to Sergei Golovan)
* src/translate.erl: Likewise
* src/ejabberd_app.erl: Added "log_path" configuration parameter
(thanks to Sergei Golovan)
* src/**/Makefile.win32: Updated (thanks to Sergei Golovan)
* src/**/*.c: Updated (thanks to Sergei Golovan)
* src/configure.erl: Added writing of version to Makefile.inc
(thanks to Sergei Golovan)
* doc/guide.tex: Updated link to expat (thanks to Sergei Golovan)
SVN Revision: 223
Diffstat (limited to '')
-rw-r--r-- | src/ejabberd_app.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index 02d3d0f7..26b29f4b 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -51,12 +51,18 @@ init() -> register(ejabberd, self()), %erlang:system_flag(fullsweep_after, 0), %error_logger:logfile({open, ?LOG_PATH}), - LogPath = case os:getenv("EJABBERD_LOG_PATH") of - false -> - ?LOG_PATH; - Path -> - Path - end, + LogPath = + case application:get_env(log_path) of + {ok, Path} -> + Path; + undefined -> + case os:getenv("EJABBERD_LOG_PATH") of + false -> + ?LOG_PATH; + Path -> + Path + end + end, error_logger:add_report_handler(ejabberd_logger_h, LogPath), %timer:apply_interval(3600000, ?MODULE, dump_ports, []), ok = erl_ddll:load_driver(ejabberd:get_so_path(), expat_erl), |