Permalink
Browse files

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk…

…/yaws@1386 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent a075ccf commit dc41472b13576eea48f778272dad6396ee19ad44 @klacke committed Feb 12, 2009
Showing with 8 additions and 19 deletions.
  1. +8 −19 src/yaws.erl
View
27 src/yaws.erl
@@ -315,25 +315,14 @@ hup(Sock) ->
dohup(Sock) ->
Env = yaws_sup:get_app_args(),
Res = try yaws_config:load(Env) of
- {ok, Gconf, Sconfs} ->
- case yaws_config:check_certs_updated() of
- false ->
- yaws_api:setconf(Gconf, Sconfs);
- true ->
- %% slightly more complex, , first stop
- %% all ssl servers entirely
-
- yaws_api:setconf(Gconf, []),
- application:stop(ssl),
- application:start(ssl),
- yaws_api:setconf(Gconf, Sconfs)
- end;
- Err ->
- Err
- catch
- _:X ->
- X
- end,
+ {ok, Gconf, Sconfs} ->
+ yaws_api:setconf(Gconf, Sconfs);
+ Err ->
+ Err
+ catch
+ _:X ->
+ X
+ end,
gen_event:notify(yaws_event_manager, {yaws_hupped, Res}),
gen_event:notify(yaws_log, {yaws_hupped, Res}),
gen_tcp:send(Sock, io_lib:format("hupped: ~p~n", [Res])),

0 comments on commit dc41472

Please sign in to comment.