backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated design related to logger, to prepare move to SCOOP concurrency.

Browse Source
This commit is contained in:
Jocelyn FIAT
2015-04-02 21:15:05 +02:00
parent e94d860fd8
commit b235fb30a7
18 changed files with 337 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/basic_auth/filter/basic_auth_filter.e
View File

@@ -50,7 +50,7 @@ feature -- Basic operations
execute_next (req, res)
end
else
api.logger.put_error (generator + ".execute Not valid", Void)
api.logger.put_debug (generator + ".execute without authentication", Void)
execute_next (req, res)
end
end

8
src/modules/node/node_module.e
View File

@@ -176,9 +176,11 @@ feature -- Handler
a_api.user_api.new_user (l_user)
end
if a_node_api.nodes_count = 0 then
create l_node.make ({STRING_32} "This is a content", {STRING_32} "And a summary", {STRING_32} "Nice title")
l_node.set_author (l_user)
a_node_api.new_node (l_node)
if l_user /= Void then
create l_node.make ({STRING_32} "This is a content", {STRING_32} "And a summary", {STRING_32} "Nice title")
l_node.set_author (l_user)
a_node_api.new_node (l_node)
end
end
create s.make_from_string ("<p>Nodes:</p>")

20
src/persistence/cms_storage_null.e
View File

@@ -49,7 +49,7 @@ feature -- Access: user
users: LIST [CMS_USER]
do
create {ARRAYED_LIST[CMS_USER]} Result.make (0)
create {ARRAYED_LIST [CMS_USER]} Result.make (0)
end
user_by_id (a_id: like {CMS_USER}.id): detachable CMS_USER
@@ -70,16 +70,16 @@ feature -- Access: user
feature -- User Nodes
user_collaborator_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
user_collaborator_nodes (a_id: like {CMS_USER}.id): LIST [CMS_NODE]
-- Possible list of nodes where the user identified by `a_id', is a collaborator.
do
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end
user_author_nodes (a_id: like {CMS_USER}.id): LIST[CMS_NODE]
user_author_nodes (a_id: like {CMS_USER}.id): LIST [CMS_NODE]
-- Possible list of nodes where the user identified by `a_id', is the author.
do
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end
feature -- Change: user
@@ -87,6 +87,7 @@ feature -- Change: user
new_user (a_user: CMS_USER)
-- Add a new user `a_user'.
do
a_user.set_id (1)
end
update_user (a_user: CMS_USER)
@@ -102,10 +103,9 @@ feature -- Access: roles and permissions
user_roles: LIST [CMS_USER_ROLE]
do
create {ARRAYED_LIST[CMS_USER_ROLE]} Result.make (0)
create {ARRAYED_LIST [CMS_USER_ROLE]} Result.make (0)
end
feature -- Change: roles and permissions
save_user_role (a_user_role: CMS_USER_ROLE)
@@ -122,13 +122,13 @@ feature -- Access: node
nodes: LIST[CMS_NODE]
-- List of nodes.
do
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end
recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
-- List of the `a_count' most recent nodes, starting from `a_lower'.
do
create {ARRAYED_LIST[CMS_NODE]} Result.make (0)
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
end
node_by_id (a_id: INTEGER_64): detachable CMS_NODE
@@ -144,7 +144,7 @@ feature -- Access: node
node_collaborators (a_id: like {CMS_NODE}.id): LIST [CMS_USER]
-- Possible list of node's collaborator.
do
create {ARRAYED_LIST[CMS_USER]} Result.make (0)
create {ARRAYED_LIST [CMS_USER]} Result.make (0)
end
feature -- Node

24
src/persistence/node/cms_node_storage_sql.e
View File

@@ -22,7 +22,7 @@ feature -- Access
-- Number of items nodes.
do
error_handler.reset
log.write_information (generator + ".nodes_count")
write_information_log (generator + ".nodes_count")
sql_query (select_nodes_count, Void)
if sql_rows_count = 1 then
Result := sql_read_integer_64 (1)
@@ -35,7 +35,7 @@ feature -- Access
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
error_handler.reset
log.write_information (generator + ".nodes")
write_information_log (generator + ".nodes")
from
sql_query (select_nodes, Void)
@@ -58,7 +58,7 @@ feature -- Access
create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
error_handler.reset
log.write_information (generator + ".nodes")
write_information_log (generator + ".nodes")
from
create l_parameters.make (2)
@@ -82,7 +82,7 @@ feature -- Access
l_parameters: STRING_TABLE [ANY]
do
error_handler.reset
log.write_information (generator + ".node")
write_information_log (generator + ".node")
create l_parameters.make (1)
l_parameters.put (a_id,"id")
sql_query (select_node_by_id, l_parameters)
@@ -97,7 +97,7 @@ feature -- Access
l_parameters: STRING_TABLE [ANY]
do
error_handler.reset
log.write_information (generator + ".node_author")
write_information_log (generator + ".node_author")
create l_parameters.make (1)
l_parameters.put (a_id, "node_id")
sql_query (select_node_author, l_parameters)
@@ -110,7 +110,7 @@ feature -- Access
-- Last insert node id.
do
error_handler.reset
log.write_information (generator + ".last_inserted_node_id")
write_information_log (generator + ".last_inserted_node_id")
sql_query (Sql_last_insert_node_id, Void)
if sql_rows_count = 1 then
Result := sql_read_integer_64 (1)
@@ -126,7 +126,7 @@ feature -- Change: Node
do
-- New node
error_handler.reset
log.write_information (generator + ".new_node")
write_information_log (generator + ".new_node")
create l_parameters.make (7)
l_parameters.put (a_node.title, "title")
l_parameters.put (a_node.summary, "summary")
@@ -153,7 +153,7 @@ feature -- Change: Node
local
l_parameters: STRING_TABLE [ANY]
do
log.write_information (generator + ".delete_node")
write_information_log (generator + ".delete_node")
error_handler.reset
create l_parameters.make (1)
@@ -169,7 +169,7 @@ feature -- Change: Node
do
create now.make_now_utc
error_handler.reset
log.write_information (generator + ".update_node")
write_information_log (generator + ".update_node")
create l_parameters.make (7)
l_parameters.put (a_node.title, "title")
l_parameters.put (a_node.summary, "summary")
@@ -195,7 +195,7 @@ feature -- Change: Node
do
-- FIXME: unused a_user_id !
error_handler.reset
log.write_information (generator + ".update_node_title")
write_information_log (generator + ".update_node_title")
create l_parameters.make (3)
l_parameters.put (a_title, "title")
l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
@@ -210,7 +210,7 @@ feature -- Change: Node
do
-- FIXME: unused a_user_id !
error_handler.reset
log.write_information (generator + ".update_node_summary")
write_information_log (generator + ".update_node_summary")
create l_parameters.make (3)
l_parameters.put (a_summary, "summary")
l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
@@ -225,7 +225,7 @@ feature -- Change: Node
do
-- FIXME: unused a_user_id !
error_handler.reset
log.write_information (generator + ".update_node_content")
write_information_log (generator + ".update_node_content")
create l_parameters.make (3)
l_parameters.put (a_content, "content")
l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")

22
src/persistence/user/cms_user_storage_sql.e
View File

@@ -28,7 +28,7 @@ feature -- Access: user
-- Number of items users.
do
error_handler.reset
log.write_information (generator + ".user_count")
write_information_log (generator + ".user_count")
sql_query (select_users_count, Void)
if sql_rows_count = 1 then
@@ -41,7 +41,7 @@ feature -- Access: user
create {ARRAYED_LIST [CMS_USER]} Result.make (0)
error_handler.reset
log.write_information (generator + ".all_users")
write_information_log (generator + ".all_users")
from
sql_query (select_users, Void)
@@ -62,7 +62,7 @@ feature -- Access: user
l_parameters: STRING_TABLE [detachable ANY]
do
error_handler.reset
log.write_information (generator + ".user")
write_information_log (generator + ".user")
create l_parameters.make (1)
l_parameters.put (a_id, "uid")
sql_query (select_user_by_id, l_parameters)
@@ -79,7 +79,7 @@ feature -- Access: user
l_parameters: STRING_TABLE [detachable ANY]
do
error_handler.reset
log.write_information (generator + ".user_by_name")
write_information_log (generator + ".user_by_name")
create l_parameters.make (1)
l_parameters.put (a_name, "name")
sql_query (select_user_by_name, l_parameters)
@@ -96,7 +96,7 @@ feature -- Access: user
l_parameters: STRING_TABLE [detachable ANY]
do
error_handler.reset
log.write_information (generator + ".user_by_email")
write_information_log (generator + ".user_by_email")
create l_parameters.make (1)
l_parameters.put (a_email, "email")
sql_query (select_user_by_email, l_parameters)
@@ -120,10 +120,10 @@ feature -- Access: user
then
Result := True
else
log.write_information (generator + ".is_valid_credential User: wrong username or password" )
write_information_log (generator + ".is_valid_credential User: wrong username or password" )
end
else
log.write_information (generator + ".is_valid_credential User:" + l_auth_login + "does not exist" )
write_information_log (generator + ".is_valid_credential User:" + l_auth_login + "does not exist" )
end
end
@@ -148,7 +148,7 @@ feature -- Change: user
l_password_salt := l_security.salt
l_password_hash := l_security.password_hash (l_password, l_password_salt)
log.write_information (generator + ".new_user")
write_information_log (generator + ".new_user")
create l_parameters.make (4)
l_parameters.put (a_user.name, "name")
l_parameters.put (l_password_hash, "password")
@@ -189,7 +189,7 @@ feature -- Change: user
l_password_hash /= Void and l_password_salt /= Void and
attached a_user.email as l_email
then
log.write_information (generator + ".update_user")
write_information_log (generator + ".update_user")
create l_parameters.make (6)
l_parameters.put (a_user.id, "uid")
l_parameters.put (a_user.name, "name")
@@ -233,7 +233,7 @@ feature {NONE} -- Implementation
l_parameters: STRING_TABLE [detachable ANY]
do
error_handler.reset
log.write_information (generator + ".user_salt")
write_information_log (generator + ".user_salt")
create l_parameters.make (1)
l_parameters.put (a_username, "name")
sql_query (select_salt_by_username, l_parameters)
@@ -282,7 +282,7 @@ feature {NONE} -- Implementation
-- Last insert user id.
do
error_handler.reset
log.write_information (generator + ".last_inserted_user_id")
write_information_log (generator + ".last_inserted_user_id")
sql_query (Sql_last_insert_user_id, Void)
if sql_rows_count = 1 then
Result := sql_read_integer_64 (1)

15
src/service/logger/cms_env_logger.e
View File

@@ -11,9 +11,6 @@ inherit
CMS_LOGGER
SHARED_LOGGER
rename
log as log_facility
end
create
make
@@ -29,32 +26,32 @@ feature -- Logging
put_information (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_information (log_message (a_message, a_data))
write_information_log (log_message (a_message, a_data))
end
put_error (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_error (log_message (a_message, a_data))
write_error_log (log_message (a_message, a_data))
end
put_warning (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_warning (log_message (a_message, a_data))
write_warning_log (log_message (a_message, a_data))
end
put_critical (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_critical (log_message (a_message, a_data))
write_critical_log (log_message (a_message, a_data))
end
put_alert (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_alert (log_message (a_message, a_data))
write_alert_log (log_message (a_message, a_data))
end
put_debug (a_message: READABLE_STRING_8; a_data: detachable ANY)
do
log_facility.write_debug (log_message (a_message, a_data))
write_debug_log (log_message (a_message, a_data))
end
end