File 0001-rename-webmachine_log-to-rabbit_web_log.patch of Package rabbitmq-web-dispatch

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-rename-webmachine_log-to-rabbit_web_log.patch of Package rabbitmq-web-dispatch

From c2704bc334468f093338d35761cfecd92301bb74 Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Fri, 18 Aug 2017 14:47:51 +0300
Subject: [PATCH] rename webmachine_log* to rabbit_web_log*

---
 src/rabbit_cowboy_middleware.erl                         |  2 +-
 src/{webmachine_log.erl => rabbit_web_log.erl}           |  2 +-
 ...achine_log_handler.erl => rabbit_web_log_handler.erl} | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename src/{webmachine_log.erl => rabbit_web_log.erl} (99%)
 rename src/{webmachine_log_handler.erl => rabbit_web_log_handler.erl} (89%)

diff --git a/src/rabbit_cowboy_middleware.erl b/src/rabbit_cowboy_middleware.erl
index 678bbe1..927e448 100644
--- a/src/rabbit_cowboy_middleware.erl
+++ b/src/rabbit_cowboy_middleware.erl
@@ -54,4 +54,4 @@ onresponse(Status, _, Body, Req) ->
     Req.
 
 log_access(Status, Body, Req) ->
-    webmachine_log:log_access({Status, Body, Req}).
+    rabbit_web_log:log_access({Status, Body, Req}).
diff --git a/src/webmachine_log.erl b/src/rabbit_web_log.erl
similarity index 99%
rename from src/webmachine_log.erl
rename to src/rabbit_web_log.erl
index 95924fe..92956bb 100644
--- a/src/webmachine_log.erl
+++ b/src/rabbit_web_log.erl
@@ -16,7 +16,7 @@
 
 %% @doc Helper functions for webmachine's default log handlers
 
--module(webmachine_log).
+-module(rabbit_web_log).
 
 -include("webmachine_logger.hrl").
 
diff --git a/src/webmachine_log_handler.erl b/src/rabbit_web_log_handler.erl
similarity index 89%
rename from src/webmachine_log_handler.erl
rename to src/rabbit_web_log_handler.erl
index 8ce9819..d4bb3e6 100644
--- a/src/webmachine_log_handler.erl
+++ b/src/rabbit_web_log_handler.erl
@@ -16,7 +16,7 @@
 
 %% @doc Default log handler for webmachine
 
--module(webmachine_log_handler).
+-module(rabbit_web_log_handler).
 
 -behaviour(gen_event).
 
@@ -44,24 +44,24 @@
 
 %% @private
 init([BaseDir]) ->
-    webmachine_log:defer_refresh(?MODULE),
+    rabbit_web_log:defer_refresh(?MODULE),
     FileName = filename:join(BaseDir, ?FILENAME),
-    {Handle, DateHour} = webmachine_log:log_open(FileName),
+    {Handle, DateHour} = rabbit_web_log:log_open(FileName),
     {ok, #state{filename=FileName, handle=Handle, hourstamp=DateHour}}.
 
 %% @private
 handle_call({_Label, MRef, get_modules}, State) ->
     {ok, {MRef, [?MODULE]}, State};
 handle_call({refresh, Time}, State) ->
-    {ok, ok, webmachine_log:maybe_rotate(?MODULE, Time, State)};
+    {ok, ok, rabbit_web_log:maybe_rotate(?MODULE, Time, State)};
 handle_call(_Request, State) ->
     {ok, ok, State}.
 
 %% @private
 handle_event({log_access, LogData}, State) ->
-    NewState = webmachine_log:maybe_rotate(?MODULE, os:timestamp(), State),
+    NewState = rabbit_web_log:maybe_rotate(?MODULE, os:timestamp(), State),
     Msg = format_req(LogData),
-    webmachine_log:log_write(NewState#state.handle, Msg),
+    rabbit_web_log:log_write(NewState#state.handle, Msg),
     {ok, NewState};
 handle_event(_Event, State) ->
     {ok, State}.
@@ -88,7 +88,7 @@ code_change(_OldVsn, State, _Extra) ->
 
 format_req({Status0, Body, Req0}) ->
     User = "-",
-    Time = webmachine_log:fmtnow(),
+    Time = rabbit_web_log:fmtnow(),
     Status = integer_to_list(Status0),
     Length = integer_to_list(iolist_size(Body)),
     {Method, Req1} = cowboy_req:method(Req0),
@@ -110,7 +110,7 @@ format_req({Status0, Body, Req0}) ->
 
 fmt_alog(Time, Ip, User, Method, Path, {VM,Vm},
          Status,  Length, Referrer, UserAgent) ->
-    [webmachine_log:fmt_ip(Ip), " - ", User, [$\s], Time, [$\s, $"], Method, " ", Path,
+    [rabbit_web_log:fmt_ip(Ip), " - ", User, [$\s], Time, [$\s, $"], Method, " ", Path,
      " HTTP/", integer_to_list(VM), ".", integer_to_list(Vm), [$",$\s],
      Status, [$\s], Length, [$\s,$"], Referrer,
      [$",$\s,$"], UserAgent, [$",$\n]].
-- 
2.14.1

Places

File 0001-rename-webmachine_log-to-rabbit_web_log.patch of Package rabbitmq-web-dispatch

Places