Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

storage: To restrict outputing access-logs for fixing leo-project/leofs/issues/593 #594

Merged
merged 1 commit into from
Jan 31, 2017
Merged

storage: To restrict outputing access-logs for fixing leo-project/leofs/issues/593 #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
299 changes: 183 additions & 116 deletions apps/leo_storage/include/leo_storage.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,133 +538,200 @@
-define(LOG_ID_ACCESS, 'log_id_access_log').
-define(LOG_FILENAME_ACCESS, "access").

-define(access_log_get(Key, Size, ReqId, Begin, Msg),
-define(ACC_LOG_L_OK, 0).
-define(ACC_LOG_L_ERROR, 1).

-define(env_access_log_level(),
case application:get_env(leo_storage, access_log_level) of
{ok, EnvAccessLogLevel} ->
EnvAccessLogLevel;
_ ->
?ACC_LOG_L_OK
end).

-define(can_output_access_log(_Case),
case _Case of
?ACC_LOG_L_OK ->
true;
_ ->
?env_access_log_level() == ?ACC_LOG_L_ERROR
end).

-define(access_log_get(_Key,_Size,_ReqId,_Begin,_Msg),
?access_log_get(?ACC_LOG_L_OK,_Key,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_get(_Case,_Key,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,
Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_storage_get(Key, Size, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_storage_get(_Key,_Size,_Begin,_Msg),
?access_log_storage_get(?ACC_LOG_L_OK,_Key,_Size,_Begin,_Msg)).
-define(access_log_storage_get(_Case,_Key,_Size,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Storage]\t~s\t~w\t\t~s\t~w\t~w\t~p\n",
message = [Key,
Size,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_range_get(Key, Start, End, Size, ReqId, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Storage]\t~s\t~w\t\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_range_get(_Key,_Start,_End,_Size,_ReqId,_Begin,_Msg),
?access_log_range_get(?ACC_LOG_L_OK,_Key,_Start,_End,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_range_get(_Case,_Key,_Start,_End,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Gateway]\t~s[~w-~w]\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,
Start,
End,
Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_storage_put(Method, Key, Size, ReqId, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[GET]\t[Gateway]\t~s[~w-~w]\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Start,
_End,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_storage_put(_Method,_Key,_Size,_ReqId,_Begin,_Msg),
?access_log_storage_put(?ACC_LOG_L_OK,_Method,_Key,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_storage_put(_Case,_Method,_Key,_Size,_ReqId,_Begin,_Msg),
begin
case Method of
case _Method of
?CMD_DELETE ->
?access_log_storage_delete(Key, Size, ReqId, Begin, Msg);
?access_log_storage_delete(_Case,_Key,_Size,_ReqId,_Begin,_Msg);
?CMD_PUT ->
?access_log_storage_put(Key, Size, ReqId, Begin, Msg)
?access_log_storage_put_1(_Case,_Key,_Size,_ReqId,_Begin,_Msg)
end
end).

-define(access_log_storage_delete(Key, Size, ReqId, Begin, Msg),
-define(access_log_storage_delete(_Key,_Size,_ReqId,_Begin,_Msg),
?access_log_storage_delete(?ACC_LOG_L_OK,_Key,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_storage_delete(_Case,_Key,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[DEL]\t[Storage]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,
Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_storage_put(Key, Size, ReqId, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[DEL]\t[Storage]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_storage_put_1(_Case,_Key,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[PUT]\t[Storage]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,
Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_put(Key, Size, ReqId, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[PUT]\t[Storage]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_put(_Key,_Size,_ReqId,_Begin,_Msg),
?access_log_put(?ACC_LOG_L_OK,_Key,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_put(_Case,_Key,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[PUT]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,
Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
end).

-define(access_log_delete(Key, Size, ReqId, Begin, Msg),
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[PUT]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).

-define(access_log_delete(_Key,_Size,_ReqId,_Begin,_Msg),
?access_log_delete(?ACC_LOG_L_OK,_Key,_Size,_ReqId,_Begin,_Msg)).
-define(access_log_delete(_Case,_Key,_Size,_ReqId,_Begin,_Msg),
begin
Latency = erlang:round((leo_date:clock() - Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[DEL]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [Key,

Size,
ReqId,
leo_date:date_format(),
leo_date:clock(),
Latency,
Msg
]}
})
case ?can_output_access_log(_Case) of
true ->
_Latency = erlang:round((leo_date:clock() - _Begin) / 1000),
leo_logger_client_base:append(
{?LOG_ID_ACCESS,
#message_log{ format = "[DEL]\t[Gateway]\t~s\t~w\t~w\t~s\t~w\t~w\t~p\n",
message = [_Key,
_Size,
_ReqId,
leo_date:date_format(),
leo_date:clock(),
_Latency,
_Msg
]}
});
false ->
ok
end
end).
5 changes: 5 additions & 0 deletions apps/leo_storage/priv/leo_storage.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ log.log_level = 1
## Is enable access-log [true, false]
## log.is_enable_access_log = false

## Access log's level
## - 0: only regular case
## - 1: includes error cases
## log.access_log_level = 0

## Output log file(s) - Erlang's log
## log.erlang = ./log/erlang

Expand Down
13 changes: 12 additions & 1 deletion apps/leo_storage/priv/leo_storage.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@
{default, 1}
]}.

%% @doc Is enable access log
%% @doc Is enable Access log
{mapping,
"log.is_enable_access_log",
"leo_storage.is_enable_access_log",
Expand All @@ -894,6 +894,17 @@
{default, false}
]}.

%% @doc Access log's level
{mapping,
"log.access_log_level",
"leo_storage.access_log_level",
[
%% 0: only regular case
%% 1: includes error cases
{datatype, integer},
{default, 0}
]}.

%% @doc Output log file(s) - erlang
{mapping,
"log.erlang",
Expand Down
Loading