diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-01 08:34:14 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-11-01 08:34:14 +0300 |
| commit | 35dc164233006938e9d092a52130f7140bb6057b (patch) | |
| tree | f9f2cf064d3c6bb2a0a58f1d7873e0b85db4293f /src/ejabberd_pkix.erl | |
| parent | Lower log level (diff) | |
Start even if there are problems with fs application
Diffstat (limited to 'src/ejabberd_pkix.erl')
| -rw-r--r-- | src/ejabberd_pkix.erl | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/ejabberd_pkix.erl b/src/ejabberd_pkix.erl index 2f065e1f..83305c15 100644 --- a/src/ejabberd_pkix.erl +++ b/src/ejabberd_pkix.erl @@ -38,6 +38,7 @@ -include("jid.hrl"). -record(state, {validate = true :: boolean(), + notify = false :: boolean(), paths = [] :: [file:filename()], certs = #{} :: map(), keys = [] :: [public_key:private_key()]}). @@ -158,9 +159,7 @@ opt_type(_) -> %%% gen_server callbacks %%%=================================================================== init([]) -> - application:load(fs), - application:set_env(fs, backwards_compatible, false), - ejabberd:start_app(fs), + Notify = start_fs(), process_flag(trap_exit, true), ets:new(?MODULE, [named_table, public, bag]), ejabberd_hooks:add(route_registered, ?MODULE, route_registered, 50), @@ -175,7 +174,7 @@ init([]) -> if Validate -> check_ca_dir(); true -> ok end, - State = #state{validate = Validate}, + State = #state{validate = Validate, notify = Notify}, case filelib:ensure_dir(filename:join(certs_dir(), "foo")) of ok -> clean_dir(certs_dir()), @@ -679,7 +678,7 @@ short_name_hash(_) -> -endif. -spec subscribe(state()) -> ok. -subscribe(State) -> +subscribe(#state{notify = true} = State) -> lists:foreach( fun(Path) -> Dir = filename:dirname(Path), @@ -691,4 +690,20 @@ subscribe(State) -> {error, _} -> ok end - end, State#state.paths). + end, State#state.paths); +subscribe(_) -> + ok. + +-spec start_fs() -> boolean(). +start_fs() -> + application:load(fs), + application:set_env(fs, backwards_compatible, false), + case application:ensure_all_started(fs) of + {ok, _} -> true; + {error, {already_loaded, _}} -> true; + {error, Reason} -> + ?ERROR_MSG("Failed to load 'fs' Erlang application: ~p; " + "certificates change detection will be disabled", + [Reason]), + false + end. |