core: tidy-up after asking lager to log to 'log' instead of 'sasl' fo…

…lder + move webmachine-specific logging options to the webzmachine application + get rid of no longer used configuration options

.gitignore

@@ -29,7 +29,6 @@ deps/
 /priv/sites/*/config
 
 /priv/log/
-/priv/sasl/
 /priv/sites/default/files/
 /priv/sites/*/files/dropbox/
 /priv/sites/*/files/preview/

priv/config.in

@@ -79,15 +79,6 @@
 %%% Inet request backlog, increase when requests are being dropped.
  %% {inet_backlog, 500},
 
-%%% Directory where log files are written.
- %% {log_dir,"priv/log"},
-
-%%% Enable performance logging (in addition to request logging).
- %% {enable_perf_logger, true},
-
-%%% Webmachine error handler, you can use your own.
- %% {webmachine_error_handler, z_webmachine_error_handler},
-
 %%% Default ImageMagick color space. Some ImageMagick versions (like 6.7.0 and above)
 %%% use the RGB colorspace, so all images are darker than the original.
 %%% Possible Values:

priv/erlang.config.in

@@ -13,7 +13,27 @@
   ]},
 
  {webzmachine,
-  [{wmtrace_dir, "priv/wmtrace"},
-   {silent_console, true}
+  [
+%%% Logger module, use this option to set your own.
+   %% {webmachine_logger_module, z_stats}, % <- default set by Zotonic
+   %% {webmachine_logger_module, webmachine_logger}, % <- webmachine default
+
+%%% Error handler module, use this option to set your own.
+   %% {error_handler, z_webmachine_error_handler}, % <- default set by Zotonic
+   %% {error_handler, webmachine_error_handler}, % <- webmachine default
+
+%%% Set this option to false if you want webmachine to write info about
+%%% opening/closing log files to the Erlang console.
+   %% {silent_console, true},
+
+%%% Location of access logs (logging is disabled if not set).
+   {log_dir, "priv/log/access/"},
+
+%%% Location of performance logs (logging is disabled if not set).
+   %% {perf_log_dir, "priv/log/perf/"},
+
+%%% Location of wmtrace logs (defaults to "priv/wmtrace" if not specified).
+   {wmtrace_dir, "priv/log/wmtrace/"}
+
   ]}
 ].

src/support/z_config.erl

@@ -266,9 +266,7 @@ default(smtp_bounce_ip) -> {ok, "127.0.0.1"};
 default(smtp_bounce_port) -> {ok, 2525};
 default(smtp_spamd_port) -> {ok, 783};
 default(smtp_delete_sent_after) -> {ok, 240};
-default(log_dir) -> {ok, filename:join([z_utils:lib_dir(priv), "log"])};
 default(inet_backlog) -> {ok, 500};
-default(webmachine_error_handler) -> {ok, z_webmachine_error_handler};
 default(dbhost) -> {ok, "localhost"};
 default(dbport) -> {ok, 5432};
 default(dbuser) -> {ok, "zotonic"};

src/support/z_sites_dispatcher.erl

@@ -360,11 +360,7 @@ redirect(IsPermanent, Location, ReqData) ->
     RD1 = wrq:set_resp_header("Location", Location, ReqData),
     {ok, RD2} = webmachine_request:send_response(case IsPermanent of true -> 301; false -> 302 end, RD1),
     LogData = webmachine_request:log_data(RD2),
-    LogModule = 
-        case application:get_env(webmachine,webmachine_logger_module) of
-            {ok, Val} -> Val;
-            _ -> webmachine_logger
-        end,
+    {ok, LogModule} = application:get_env(webzmachine, webmachine_logger_module),
     spawn(LogModule, log_access, [LogData]),
     handled.
 

src/zotonic_sup.erl

@@ -210,27 +210,16 @@ init_ua_classifier() ->
 %%      NOTE: This part has been removed from webmachine_mochiweb:start/2 to avoid
 %%      messing with application parameters when starting up a new wm-mochiweb process.
 init_webmachine() -> 
-    ErrorHandler0 = z_config:get_dirty(webmachine_error_handler),        
-    ErrorHandler = 
-        case ErrorHandler0 of 
-            undefined ->
-                webmachine_error_handler;
-            EH -> EH
-        end,
-    application:set_env(webzmachine, server_header, webmachine_request:server_header() ++ " Zotonic/" ++ ?ZOTONIC_VERSION),
-    application:set_env(webzmachine, error_handler, ErrorHandler),        
-
-    LogDir = z_config:get_dirty(log_dir),
-
-    application:set_env(webzmachine, webmachine_logger_module, z_stats),
-    webmachine_sup:start_logger(LogDir),
-
-    case z_config:get_dirty(enable_perf_logger) of
-        true ->
-            application:set_env(webzmachine, enable_perf_logger, true),
-            webmachine_sup:start_perf_logger(LogDir);
-        _ ->
-            ignore
+    ServerHeader = webmachine_request:server_header() ++ " Zotonic/" ++ ?ZOTONIC_VERSION,
+    application:set_env(webzmachine, server_header, ServerHeader),
+    set_webzmachine_default(webmachine_logger_module, z_stats),
+    set_webzmachine_default(error_handler, z_webmachine_error_handler),
+    webmachine_sup:start_logger().
+
+set_webzmachine_default(Par, Def) ->
+    case application:get_env(webzmachine, Par) of
+        undefined -> application:set_env(webzmachine, Par, Def);
+        _ -> nop
     end.
 
 %% @todo Exclude platforms that do not support raw ipv6 socket options