diff --git a/cms-safe.ecf b/cms-safe.ecf
index 3cabebe..016bd47 100644
--- a/cms-safe.ecf
+++ b/cms-safe.ecf
@@ -8,19 +8,19 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
/EIFGENs$
diff --git a/cms.ecf b/cms.ecf
index 727cca1..9ad4c4f 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -8,19 +8,19 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
/EIFGENs$
diff --git a/examples/demo/demo-safe.ecf b/examples/demo/demo-safe.ecf
index 77804c0..a7c63f1 100644
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -9,43 +9,49 @@
-
+
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/examples/demo/demo.ini b/examples/demo/demo.ini
index f51fcfd..e09f0dd 100644
--- a/examples/demo/demo.ini
+++ b/examples/demo/demo.ini
@@ -1,2 +1,2 @@
-port=8099
-#verbose=true
\ No newline at end of file
+port=9090
+#verbose=true
diff --git a/examples/demo/launcher/any/application_launcher.e b/examples/demo/launcher/any/application_launcher.e
index 0ef505c..bb184d0 100644
--- a/examples/demo/launcher/any/application_launcher.e
+++ b/examples/demo/launcher/any/application_launcher.e
@@ -8,10 +8,10 @@ note
revision: "$Revision: 36 $"
class
- APPLICATION_LAUNCHER
+ APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
inherit
- APPLICATION_LAUNCHER_I
+ APPLICATION_LAUNCHER_I [G]
feature -- Custom
diff --git a/examples/demo/launcher/any/application_launcher_i.e b/examples/demo/launcher/any/application_launcher_i.e
index 0744c80..ac0dc51 100644
--- a/examples/demo/launcher/any/application_launcher_i.e
+++ b/examples/demo/launcher/any/application_launcher_i.e
@@ -10,24 +10,28 @@ note
revision: "$Revision: 36 $"
deferred class
- APPLICATION_LAUNCHER_I
+ APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
inherit
SHARED_EXECUTION_ENVIRONMENT
feature -- Execution
- launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
nature: like launcher_nature
do
nature := launcher_nature
- if nature = Void or else nature = nature_nino then
- launch_nino (a_service, opts)
+ if nature = Void then
+ launch_httpd (opts)
+ elseif nature = nature_httpd then
+ launch_httpd (opts)
+ elseif nature = nature_nino then
+ launch_nino (opts)
elseif nature = nature_cgi then
- launch_cgi (a_service, opts)
+ launch_cgi (opts)
elseif nature = nature_libfcgi then
- launch_libfcgi (a_service, opts)
+ launch_libfcgi (opts)
else
-- bye bye
(create {EXCEPTIONS}).die (-1)
@@ -43,14 +47,16 @@ feature {NONE} -- Access
--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
local
p: PATH
- l_entry_name: READABLE_STRING_32
ext: detachable READABLE_STRING_32
do
create p.make_from_string (execution_environment.arguments.command_name)
if attached p.entry as l_entry then
- ext := l_entry.extension
+ ext := l_entry.extension
end
if ext /= Void then
+ if ext.same_string (nature_httpd) then
+ Result := nature_httpd
+ end
if ext.same_string (nature_nino) then
Result := nature_nino
end
@@ -61,39 +67,58 @@ feature {NONE} -- Access
Result := nature_libfcgi
end
end
+ Result := default_nature
+ end
+
+feature {NONE} -- httpd
+
+ nature_httpd: STRING = "httpd"
+
+ launch_httpd (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ local
+ launcher: WSF_HTTPD_SERVICE_LAUNCHER [G]
+ do
+ create launcher.make_and_launch (opts)
end
feature {NONE} -- nino
nature_nino: STRING = "nino"
- launch_nino (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
- launcher: WSF_NINO_SERVICE_LAUNCHER
+ launcher: WSF_NINO_SERVICE_LAUNCHER [G]
do
- create launcher.make_and_launch (a_service, opts)
+ create launcher.make_and_launch (opts)
end
feature {NONE} -- cgi
nature_cgi: STRING = "cgi"
- launch_cgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
- launcher: WSF_CGI_SERVICE_LAUNCHER
+ launcher: WSF_CGI_SERVICE_LAUNCHER [G]
do
- create launcher.make_and_launch (a_service, opts)
+ create launcher.make_and_launch (opts)
end
feature {NONE} -- libfcgi
nature_libfcgi: STRING = "libfcgi"
- launch_libfcgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
- launcher: WSF_LIBFCGI_SERVICE_LAUNCHER
+ launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
do
- create launcher.make_and_launch (a_service, opts)
+ create launcher.make_and_launch (opts)
+ end
+
+feature -- Default
+
+ default_nature: STRING
+ do
+ Result := nature_httpd
end
diff --git a/examples/demo/launcher/default/application_launcher.e b/examples/demo/launcher/default/application_launcher.e
index 0ef505c..bb184d0 100644
--- a/examples/demo/launcher/default/application_launcher.e
+++ b/examples/demo/launcher/default/application_launcher.e
@@ -8,10 +8,10 @@ note
revision: "$Revision: 36 $"
class
- APPLICATION_LAUNCHER
+ APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
inherit
- APPLICATION_LAUNCHER_I
+ APPLICATION_LAUNCHER_I [G]
feature -- Custom
diff --git a/examples/demo/launcher/default/application_launcher_i.e b/examples/demo/launcher/default/application_launcher_i.e
index e665189..4d91129 100644
--- a/examples/demo/launcher/default/application_launcher_i.e
+++ b/examples/demo/launcher/default/application_launcher_i.e
@@ -10,15 +10,15 @@ note
revision: "$Revision: 96596 $"
deferred class
- APPLICATION_LAUNCHER_I
+ APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
feature -- Execution
- launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
- launcher: WSF_DEFAULT_SERVICE_LAUNCHER
+ launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
do
- create {WSF_DEFAULT_SERVICE_LAUNCHER} launcher.make_and_launch (a_service, opts)
+ create launcher.make_and_launch (opts)
end
end
diff --git a/examples/demo/modules/demo/cms_demo_module-safe.ecf b/examples/demo/modules/demo/cms_demo_module-safe.ecf
index c069119..ecc83e7 100644
--- a/examples/demo/modules/demo/cms_demo_module-safe.ecf
+++ b/examples/demo/modules/demo/cms_demo_module-safe.ecf
@@ -13,11 +13,11 @@
-
+
-
-
+
+
diff --git a/examples/demo/src/ewf_roc_server.e b/examples/demo/src/ewf_roc_server.e
index c6c1a75..cfcb8a1 100644
--- a/examples/demo/src/ewf_roc_server.e
+++ b/examples/demo/src/ewf_roc_server.e
@@ -16,17 +16,10 @@ inherit
initialize
end
- WSF_SERVICE
- redefine
- execute
- end
-
REFACTORING_HELPER
SHARED_EXECUTION_ENVIRONMENT
- SHARED_LOGGER
-
create
make_and_launch
@@ -43,36 +36,19 @@ feature {NONE} -- Initialization
do
Precursor
create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("demo.ini")
- initialize_cms (cms_setup)
end
-feature -- Service
-
- cms_service: CMS_SERVICE
- -- cms service.
-
- execute (req: WSF_REQUEST; res: WSF_RESPONSE)
- do
- cms_service.execute (req, res)
- end
-
-feature -- Layout
-
- layout: CMS_LAYOUT
- -- cms layout.
-
feature {NONE} -- Launch operation
- launcher: APPLICATION_LAUNCHER
+ launcher: APPLICATION_LAUNCHER [EWF_ROC_SERVER_EXECUTION]
- launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+ launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
local
l_retry: BOOLEAN
l_message: STRING
do
if not l_retry then
- log.write_debug (generator + ".launch")
- launcher.launch (a_service, opts)
+ launcher.launch (opts)
else
-- error hanling.
create l_message.make (1024)
@@ -92,68 +68,11 @@ feature {NONE} -- Launch operation
l_message.append ("%N%N")
end
-- send email shutdown
- log.write_debug (generator + ".launch shutdown")
end
rescue
l_retry := True
retry
end
-feature -- CMS Initialization
-
- cms_setup: CMS_DEFAULT_SETUP
- local
- utf: UTF_CONVERTER
- do
- if attached execution_environment.arguments.separate_character_option_value ('d') as l_dir then
- create layout.make_with_directory_name (l_dir)
- else
- create layout.make_default
- end
- initialize_logger (layout)
- log.write_debug (generator + ".cms_setup based directory %"" + utf.escaped_utf_32_string_to_utf_8_string_8 (layout.path.name) + "%"")
- create Result.make (layout)
- setup_storage (Result)
- end
-
- initialize_cms (a_setup: CMS_SETUP)
- local
- cms: CMS_SERVICE
- api: CMS_API
- do
- log.write_debug (generator + ".initialize_cms")
- setup_modules (a_setup)
- create api.make (a_setup)
- create cms.make (api)
- cms_service := cms
- end
-
-feature -- CMS setup
-
- setup_modules (a_setup: CMS_SETUP)
- -- Setup additional modules.
- local
- m: CMS_MODULE
- do
- create {BASIC_AUTH_MODULE} m.make
- if not a_setup.module_with_same_type_registered (m) then
- m.enable
- a_setup.register_module (m)
- end
-
- create {CMS_DEMO_MODULE} m.make
- m.enable
- a_setup.register_module (m)
- end
-
- setup_storage (a_setup: CMS_SETUP)
- do
- debug ("refactor_fixme")
- to_implement ("To implement custom storage")
- end
--- a_setup.storage_drivers.force (create {CMS_STORAGE_MYSQL_BUILDER}.make, "mysql")
- a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE_BUILDER}.make, "sqlite")
- end
-
end
diff --git a/examples/demo/src/ewf_roc_server_execution.e b/examples/demo/src/ewf_roc_server_execution.e
new file mode 100644
index 0000000..61d0e71
--- /dev/null
+++ b/examples/demo/src/ewf_roc_server_execution.e
@@ -0,0 +1,103 @@
+note
+ description: "Summary description for {EWF_ROC_SERVER_EXECUTION}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ EWF_ROC_SERVER_EXECUTION
+
+inherit
+ WSF_EXECUTION
+ redefine
+ initialize
+ end
+
+ REFACTORING_HELPER
+
+ SHARED_LOGGER
+
+create
+ make
+
+feature {NONE} -- Initialization
+
+ initialize
+ do
+ Precursor
+ initialize_cms (cms_setup)
+ end
+
+feature -- Access
+
+ cms_service: CMS_SERVICE
+ -- cms service.
+
+ layout: CMS_LAYOUT
+ -- cms layout.
+
+feature -- Execution
+
+ execute
+ local
+ do
+ cms_service.execute (request, response)
+ end
+
+feature -- CMS Initialization
+
+ cms_setup: CMS_DEFAULT_SETUP
+ local
+ utf: UTF_CONVERTER
+ do
+ if attached execution_environment.arguments.separate_character_option_value ('d') as l_dir then
+ create layout.make_with_directory_name (l_dir)
+ else
+ create layout.make_default
+ end
+ initialize_logger (layout)
+ write_debug_log (generator + ".cms_setup based directory %"" + utf.escaped_utf_32_string_to_utf_8_string_8 (layout.path.name) + "%"")
+ create Result.make (layout)
+ setup_storage (Result)
+ end
+
+ initialize_cms (a_setup: CMS_SETUP)
+ local
+ cms: CMS_SERVICE
+ api: CMS_API
+ do
+ write_debug_log (generator + ".initialize_cms")
+ setup_modules (a_setup)
+ create api.make (a_setup)
+ create cms.make (api)
+ cms_service := cms
+ end
+
+feature -- CMS setup
+
+ setup_modules (a_setup: CMS_SETUP)
+ -- Setup additional modules.
+ local
+ m: CMS_MODULE
+ do
+ create {BASIC_AUTH_MODULE} m.make
+ if not a_setup.module_with_same_type_registered (m) then
+ m.enable
+ a_setup.register_module (m)
+ end
+
+ create {CMS_DEMO_MODULE} m.make
+ m.enable
+ a_setup.register_module (m)
+ end
+
+ setup_storage (a_setup: CMS_SETUP)
+ do
+ debug ("refactor_fixme")
+ to_implement ("To implement custom storage")
+ end
+-- a_setup.storage_drivers.force (create {CMS_STORAGE_MYSQL_BUILDER}.make, "mysql")
+ a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE_BUILDER}.make, "sqlite")
+ end
+
+end
diff --git a/library/layout/src/error/shared_error.e b/library/layout/src/error/shared_error.e
index 943cd5c..1842ac8 100644
--- a/library/layout/src/error/shared_error.e
+++ b/library/layout/src/error/shared_error.e
@@ -56,10 +56,10 @@ feature -- Element Settings
l_message.append ("An unknown exception was raised.")
end
set_last_error (l_message, a_location)
- log.write_critical (generator + ".set_last_error_from_exception " + l_message)
+ write_critical_log (generator + ".set_last_error_from_exception " + l_message)
else
set_last_error ("Generic error", "")
- log.write_critical (generator + ".set_last_error_from_exception Generic Error")
+ write_critical_log (generator + ".set_last_error_from_exception Generic Error")
end
rescue
l_retried := True
@@ -75,7 +75,7 @@ feature -- Element Settings
attached_location: a_location /= Void
do
create last_error.make (a_message, a_location)
- log.write_critical (generator + ".set_last_error " + a_message)
+ write_critical_log (generator + ".set_last_error " + a_message)
successful := False
ensure
last_error_set: attached last_error
@@ -103,6 +103,6 @@ feature -- Element Settings
successful: successful
end
note
- copyright: "2011-2014, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+ copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
end
diff --git a/library/layout/src/logger/logger.e b/library/layout/src/logger/logger.e
new file mode 100644
index 0000000..032cdbe
--- /dev/null
+++ b/library/layout/src/logger/logger.e
@@ -0,0 +1,172 @@
+note
+ description: "Summary description for {LOGGER}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ LOGGER
+
+inherit
+ ANY
+
+ LOG_PRIORITY_CONSTANTS
+ export
+ {NONE} all
+ end
+
+ SHARED_EXECUTION_ENVIRONMENT
+ export
+ {NONE} all
+ end
+
+create
+ make,
+ make_with_layout
+
+feature {NONE} -- Initialization
+
+ make
+ do
+ create log.make
+ end
+
+ make_with_layout (app: APPLICATION_LAYOUT)
+ do
+ make
+ apply_layout (app)
+ end
+
+feature -- Change
+
+ apply_layout (app: APPLICATION_LAYOUT)
+ do
+ initialize_logger (app, log)
+ end
+
+feature {NONE} -- Internal
+
+ log: LOGGING_FACILITY
+
+feature -- Logging
+
+ put_information (a_message: separate READABLE_STRING_8)
+ do
+ log.write_information (create {STRING}.make_from_separate (a_message))
+ end
+
+ put_error (a_message: separate READABLE_STRING_8)
+ do
+ log.write_error (create {STRING}.make_from_separate (a_message))
+ end
+
+ put_warning (a_message: separate READABLE_STRING_8)
+ do
+ log.write_warning (create {STRING}.make_from_separate (a_message))
+ end
+
+ put_critical (a_message: separate READABLE_STRING_8)
+ do
+ log.write_critical (create {STRING}.make_from_separate (a_message))
+ end
+
+ put_alert (a_message: separate READABLE_STRING_8)
+ do
+ log.write_alert (create {STRING}.make_from_separate (a_message))
+ end
+
+ put_debug (a_message: separate READABLE_STRING_8)
+ do
+ log.write_debug (create {STRING}.make_from_separate (a_message))
+ end
+
+feature {NONE} -- Implementation
+
+ initialize_logger (app: APPLICATION_LAYOUT; a_log: like log)
+ local
+ l_log_writer_file: LOG_ROLLING_WRITER_FILE
+ l_log_writer: LOG_WRITER
+ l_logs_path: detachable PATH
+ l_logger_config: LOGGER_CONFIGURATION
+ ut: FILE_UTILITIES
+ do
+ l_logger_config := new_logger_level_configuration (app.application_config_path)
+ l_logs_path := l_logger_config.location
+ if l_logs_path = Void then
+ l_logs_path := app.logs_path
+ end
+ if ut.directory_path_exists (l_logs_path) then
+ create l_log_writer_file.make_at_location (l_logs_path.extended (app.name).appended_with_extension ("log"))
+ l_log_writer_file.set_max_file_size ({NATURAL_64} 1024 * 1204)
+ l_log_writer_file.set_max_backup_count (l_logger_config.backup_count)
+ l_log_writer := l_log_writer_file
+ else
+ -- Should we create the directory anyway ?
+ create {LOG_WRITER_NULL} l_log_writer
+ end
+ set_logger_level (l_log_writer, l_logger_config.level)
+ a_log.register_log_writer (l_log_writer)
+ end
+
+ set_logger_level (a_log_writer: LOG_WRITER; a_priority: INTEGER)
+ -- Setup the logger level based on `a_priority'
+ do
+ if a_priority = log_debug then
+ a_log_writer.enable_debug_log_level
+ elseif a_priority = Log_emergency then
+ a_log_writer.enable_emergency_log_level
+ elseif a_priority = Log_alert then
+ a_log_writer.enable_alert_log_level
+ elseif a_priority = Log_critical then
+ a_log_writer.enable_critical_log_level
+ elseif a_priority = Log_error then
+ a_log_writer.enable_error_log_level
+ elseif a_priority = Log_warning then
+ a_log_writer.enable_warning_log_level
+ elseif a_priority = Log_notice then
+ a_log_writer.enable_notice_log_level
+ elseif a_priority = Log_information then
+ a_log_writer.enable_information_log_level
+ else
+ a_log_writer.enable_unkno_log_level
+ end
+ end
+
+ new_logger_level_configuration (a_path: PATH): LOGGER_CONFIGURATION
+ -- Retrieve a new logger level configuration.
+ -- By default, level is set to `DEBUG'.
+ local
+ l_parser: JSON_PARSER
+ ut: FILE_UTILITIES
+ do
+ create Result
+ if
+ ut.file_path_exists (a_path) and then
+ attached (create {JSON_FILE_READER}).read_json_from (a_path.name) as json_file
+ then
+ create l_parser.make_with_string (json_file)
+ l_parser.parse_content
+ if
+ l_parser.is_valid and then
+ attached l_parser.parsed_json_object as jv and then
+ attached {JSON_OBJECT} jv.item ("logger") as l_logger
+ then
+ if attached {JSON_STRING} l_logger.item ("location") as l_location then
+ Result.set_location_with_string (l_location.item)
+ end
+ if attached {JSON_STRING} l_logger.item ("backup_count") as l_count then
+ if l_count.item.is_natural then
+ Result.set_backup_count (l_count.item.to_natural)
+ end
+ end
+ if attached {JSON_STRING} l_logger.item ("level") as l_level then
+ Result.set_level (l_level.item)
+ end
+ end
+ end
+ end
+
+note
+ copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
diff --git a/library/layout/src/logger/logging_facility.e b/library/layout/src/logger/logging_facility.e
index 7807e15..0b87e88 100644
--- a/library/layout/src/logger/logging_facility.e
+++ b/library/layout/src/logger/logging_facility.e
@@ -67,7 +67,6 @@ feature -- Output
rescue
l_retry := True
retry
-
end
write_emergency (msg: STRING)
@@ -135,6 +134,6 @@ feature -- Output
retry
end
note
- copyright: "2011-2014, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+ copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
end
diff --git a/library/layout/src/logger/shared_logger.e b/library/layout/src/logger/shared_logger.e
index 20a24fd..8d32052 100644
--- a/library/layout/src/logger/shared_logger.e
+++ b/library/layout/src/logger/shared_logger.e
@@ -13,100 +13,103 @@ inherit
feature -- Logger
- log: LOGGING_FACILITY
+ logger: separate LOGGER
-- `log' facility (once per process)
-- that could be shared between threads
-- without reinitializing it.
- once ("PROCESS")
- create Result.make
+ do
+ Result := logger_cell_item (logger_cell)
end
+ logger_cell: separate CELL [separate LOGGER]
+ once ("PROCESS")
+ create Result.put (create {separate LOGGER}.make)
+ end
+
+ logger_cell_item (a_cell: like logger_cell): separate LOGGER
+ do
+ Result := a_cell.item
+ end
+
+feature -- Logging
+
+ write_debug_log (m: READABLE_STRING_8)
+ do
+ write_debug_log_to (m, logger)
+ end
+
+ write_information_log (m: READABLE_STRING_8)
+ do
+ write_information_log_to (m, logger)
+ end
+
+ write_warning_log (m: READABLE_STRING_8)
+ do
+ write_warning_log_to (m, logger)
+ end
+
+ write_error_log (m: READABLE_STRING_8)
+ do
+ write_error_log_to (m, logger)
+ end
+
+ write_critical_log (m: READABLE_STRING_8)
+ do
+ write_critical_log_to (m, logger)
+ end
+
+ write_alert_log (m: READABLE_STRING_8)
+ do
+ write_alert_log_to (m, logger)
+ end
+
+feature {NONE} -- Logger: separate implementation
+
+ write_debug_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_debug (m)
+ end
+
+ write_information_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_information (m)
+ end
+
+ write_warning_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_warning (m)
+ end
+
+ write_error_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_error (m)
+ end
+
+ write_critical_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_critical (m)
+ end
+
+ write_alert_log_to (m: READABLE_STRING_8; a_log: like logger)
+ do
+ a_log.put_alert (m)
+ end
+
+
feature {NONE} -- Implementation
initialize_logger (app: APPLICATION_LAYOUT)
local
- l_log_writer_file: LOG_ROLLING_WRITER_FILE
- l_log_writer: LOG_WRITER
- l_logs_path: detachable PATH
- l_logger_config: LOGGER_CONFIGURATION
- ut: FILE_UTILITIES
+ l_logger: LOGGER
do
- l_logger_config := new_logger_level_configuration (app.application_config_path)
- l_logs_path := l_logger_config.location
- if l_logs_path = Void then
- l_logs_path := app.logs_path
- end
- if ut.directory_path_exists (l_logs_path) then
- create l_log_writer_file.make_at_location (l_logs_path.extended (app.name).appended_with_extension ("log"))
- l_log_writer_file.set_max_file_size ({NATURAL_64} 1024 * 1204)
- l_log_writer_file.set_max_backup_count (l_logger_config.backup_count)
- l_log_writer := l_log_writer_file
- else
- -- Should we create the directory anyway ?
- create {LOG_WRITER_NULL} l_log_writer
- end
- set_logger_level (l_log_writer, l_logger_config.level)
- log.register_log_writer (l_log_writer)
+ create l_logger.make_with_layout (app)
+ set_logger_to (l_logger, logger_cell)
end
- set_logger_level (a_log_writer: LOG_WRITER; a_priority: INTEGER)
- -- Setup the logger level based on `a_priority'
+ set_logger_to (a_logger: separate LOGGER; a_cell: like logger_cell)
do
- if a_priority = log_debug then
- a_log_writer.enable_debug_log_level
- elseif a_priority = Log_emergency then
- a_log_writer.enable_emergency_log_level
- elseif a_priority = Log_alert then
- a_log_writer.enable_alert_log_level
- elseif a_priority = Log_critical then
- a_log_writer.enable_critical_log_level
- elseif a_priority = Log_error then
- a_log_writer.enable_error_log_level
- elseif a_priority = Log_warning then
- a_log_writer.enable_warning_log_level
- elseif a_priority = Log_notice then
- a_log_writer.enable_notice_log_level
- elseif a_priority = Log_information then
- a_log_writer.enable_information_log_level
- else
- a_log_writer.enable_unkno_log_level
- end
+ a_cell.replace (a_logger)
end
-
- new_logger_level_configuration (a_path: PATH): LOGGER_CONFIGURATION
- -- Retrieve a new logger level configuration.
- -- By default, level is set to `DEBUG'.
- local
- l_parser: JSON_PARSER
- ut: FILE_UTILITIES
- do
- create Result
- if
- ut.file_path_exists (a_path) and then
- attached (create {JSON_FILE_READER}).read_json_from (a_path.name) as json_file
- then
- create l_parser.make_with_string (json_file)
- l_parser.parse_content
- if
- l_parser.is_valid and then
- attached l_parser.parsed_json_object as jv and then
- attached {JSON_OBJECT} jv.item ("logger") as l_logger
- then
- if attached {JSON_STRING} l_logger.item ("location") as l_location then
- Result.set_location_with_string (l_location.item)
- end
- if attached {JSON_STRING} l_logger.item ("backup_count") as l_count then
- if l_count.item.is_natural then
- Result.set_backup_count (l_count.item.to_natural)
- end
- end
- if attached {JSON_STRING} l_logger.item ("level") as l_level then
- Result.set_level (l_level.item)
- end
- end
- end
- end
-
note
copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/persistence/implementation/store/cms_storage_store_sql.e b/library/persistence/implementation/store/cms_storage_store_sql.e
index 57cee85..d5511bd 100644
--- a/library/persistence/implementation/store/cms_storage_store_sql.e
+++ b/library/persistence/implementation/store/cms_storage_store_sql.e
@@ -20,7 +20,7 @@ feature {NONE} -- Initialization
is_connected: a_connection.is_connected
do
connection := a_connection
- log.write_information (generator + ".make - is database connected? "+ a_connection.is_connected.out )
+ write_information_log (generator + ".make - is database connected? "+ a_connection.is_connected.out )
create {DATABASE_HANDLER_IMPL} db_handler.make (a_connection)
@@ -50,7 +50,7 @@ feature -- Query
do
error_handler.append (db_handler.database_error_handler)
if error_handler.has_error then
- log.write_critical (generator + ".post_execution " + error_handler.as_string_representation)
+ write_critical_log (generator + ".post_execution " + error_handler.as_string_representation)
end
end
diff --git a/library/persistence/implementation/store/database/database_connection_odbc.e b/library/persistence/implementation/store/database/database_connection_odbc.e
index cc03ea5..c9c2512 100644
--- a/library/persistence/implementation/store/database/database_connection_odbc.e
+++ b/library/persistence/implementation/store/database/database_connection_odbc.e
@@ -42,7 +42,7 @@ feature -- Initialization
rescue
create db_control.make
-- set_last_error_from_exception ("Connection execution")
--- log.write_critical (generator + ".make_common:" + last_error_message)
+-- write_critical_log (generator + ".make_common:" + last_error_message)
if is_connected then
disconnect
end
@@ -73,7 +73,7 @@ feature -- Initialization
rescue
create db_control.make
-- set_last_error_from_exception ("Connection execution")
--- log.write_critical (generator + ".make_common:" + last_error_message)
+-- write_critical_log (generator + ".make_common:" + last_error_message)
if is_connected then
disconnect
end
@@ -103,20 +103,20 @@ feature -- Initialization
login_with_connection_string (a_string: STRING)
-- Login with `a_connection_string'and immediately connect to database.
do
- log.write_debug (generator +".login_with_connection_string")
+ write_debug_log (generator +".login_with_connection_string")
create db_application.login_with_connection_string (a_string)
create database_error_handler.make
db_application.set_base
create db_control.make
- log.write_debug (generator +".login_with_connection_string, is_keep_connection? "+ is_keep_connection.out )
+ write_debug_log (generator +".login_with_connection_string, is_keep_connection? "+ is_keep_connection.out )
keep_connection := is_keep_connection
if keep_connection then
connect
if not db_control.is_ok then
- log.write_critical (generator +".login_with_connection_string:"+ db_control.error_code.out )
- log.write_critical (generator +".login_with_connection_string:"+ db_control.error_message_32 )
+ write_critical_log (generator +".login_with_connection_string:"+ db_control.error_code.out )
+ write_critical_log (generator +".login_with_connection_string:"+ db_control.error_message_32 )
end
- log.write_debug (generator +".login_with_connection_string, After connect, is_connected? "+ is_connected.out)
+ write_debug_log (generator +".login_with_connection_string, After connect, is_connected? "+ is_connected.out)
end
end
diff --git a/library/persistence/implementation/store/database/database_handler.e b/library/persistence/implementation/store/database/database_handler.e
index ee33311..c974b35 100644
--- a/library/persistence/implementation/store/database/database_handler.e
+++ b/library/persistence/implementation/store/database/database_handler.e
@@ -177,7 +177,7 @@ feature -- Error handling
do
if attached db_change as l_change and then not l_change.is_ok then
database_error_handler.add_database_error (l_change.error_message_32, l_change.error_code)
- log.write_error (generator + ".check_database_change_error: " + l_change.error_message_32)
+ write_error_log (generator + ".check_database_change_error: " + l_change.error_message_32)
l_change.reset
end
end
@@ -187,7 +187,7 @@ feature -- Error handling
do
if attached db_selection as l_selection and then not l_selection.is_ok then
database_error_handler.add_database_error (l_selection.error_message_32, l_selection.error_code)
- log.write_error (generator + ".check_database_selection_error: " + l_selection.error_message_32)
+ write_error_log (generator + ".check_database_selection_error: " + l_selection.error_message_32)
l_selection.reset
end
end
diff --git a/library/persistence/implementation/store/database/database_handler_impl.e b/library/persistence/implementation/store/database/database_handler_impl.e
index 1de28a1..e6e61b6 100644
--- a/library/persistence/implementation/store/database/database_handler_impl.e
+++ b/library/persistence/implementation/store/database/database_handler_impl.e
@@ -44,7 +44,7 @@ feature -- Functionality
items := l_store.execute_reader (l_db_selection)
check_database_selection_error
end
- log.write_debug ( generator+".execute_reader Successful")
+ write_debug_log ( generator+".execute_reader Successful")
end
rescue
l_retried := True
@@ -69,7 +69,7 @@ feature -- Functionality
l_store.execute_writer (l_db_change)
check_database_change_error
end
- log.write_debug ( generator+".execute_writer Successful")
+ write_debug_log ( generator+".execute_writer Successful")
end
rescue
l_retried := True
diff --git a/library/persistence/implementation/store/database/database_query.e b/library/persistence/implementation/store/database/database_query.e
index 9c91238..531409d 100644
--- a/library/persistence/implementation/store/database/database_query.e
+++ b/library/persistence/implementation/store/database/database_query.e
@@ -19,8 +19,8 @@ feature {NONE} -- Intialization
data_reader (a_query: STRING; a_parameters: like parameters)
-- SQL data reader for the query `a_query' with arguments `a_parameters'
do
- log.write_information (generator + ".data_reader" + " execute query: " + a_query)
- log.write_debug (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
+ write_information_log (generator + ".data_reader" + " execute query: " + a_query)
+ write_debug_log (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
query := a_query
parameters := a_parameters
ensure
@@ -43,7 +43,7 @@ feature -- Execution
a_base_selection.load_result
Result := a_base_selection.container
else
- log.write_error (generator + "." + a_base_selection.error_message_32)
+ write_error_log (generator + "." + a_base_selection.error_message_32)
end
unset_map_name (a_base_selection)
a_base_selection.terminate
diff --git a/library/persistence/implementation/store/database/database_store_procedure.e b/library/persistence/implementation/store/database/database_store_procedure.e
index 82c9fa8..97d5ecd 100644
--- a/library/persistence/implementation/store/database/database_store_procedure.e
+++ b/library/persistence/implementation/store/database/database_store_procedure.e
@@ -20,8 +20,8 @@ feature -- Intialization
local
l_retried: BOOLEAN
do
- log.write_information (generator + ".data_reader" + " execute store procedure: " + a_sp)
- log.write_debug (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
+ write_information_log (generator + ".data_reader" + " execute store procedure: " + a_sp)
+ write_debug_log (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
if not l_retried then
stored_procedure := a_sp
parameters := a_parameters
@@ -33,14 +33,14 @@ feature -- Intialization
if proc.exists then
if proc.text_32 /= Void then
debug
- log.write_debug ( generator + ".data_reader: " + proc.text_32)
+ write_debug_log ( generator + ".data_reader: " + proc.text_32)
end
end
else
has_error := True
error_message := proc.error_message_32
error_code := proc.error_code
- log.write_error (generator + ".data_witer message:" + proc.error_message_32 + " code:" + proc.error_code.out)
+ write_error_log (generator + ".data_witer message:" + proc.error_message_32 + " code:" + proc.error_code.out)
end
else
stored_procedure := a_sp
@@ -49,7 +49,7 @@ feature -- Intialization
end
rescue
set_last_error_from_exception ("SQL execution")
- log.write_critical (generator+ ".data_reader " + last_error_message)
+ write_critical_log (generator+ ".data_reader " + last_error_message)
l_retried := True
retry
end
@@ -59,8 +59,8 @@ feature -- Intialization
local
l_retried: BOOLEAN
do
- log.write_information (generator + ".data_reader" + " execute store procedure: " + a_sp)
- log.write_debug (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
+ write_information_log (generator + ".data_reader" + " execute store procedure: " + a_sp)
+ write_debug_log (generator + ".data_reader" + " arguments:" + log_parameters (a_parameters))
if not l_retried then
stored_procedure := a_sp
parameters := a_parameters
@@ -70,14 +70,14 @@ feature -- Intialization
if proc.exists then
if proc.text_32 /= Void then
debug
- log.write_debug ( generator + ".data_writer: " + proc.text_32)
+ write_debug_log ( generator + ".data_writer: " + proc.text_32)
end
end
else
has_error := True
error_message := proc.error_message_32
error_code := proc.error_code
- log.write_error (generator + ".data_witer message:" + proc.error_message_32 + " code:" + proc.error_code.out)
+ write_error_log (generator + ".data_witer message:" + proc.error_message_32 + " code:" + proc.error_code.out)
end
else
stored_procedure := a_sp
@@ -86,12 +86,11 @@ feature -- Intialization
end
rescue
set_last_error_from_exception ("SQL execution")
- log.write_critical (generator+ ".data_reader " + last_error_message)
+ write_critical_log (generator+ ".data_reader " + last_error_message)
l_retried := True
retry
end
-
execute_reader (a_base_selection: DB_SELECTION): detachable LIST [DB_RESULT]
-- Execute the Current store procedure.
do
diff --git a/library/persistence/mysql/persistence_mysql-safe.ecf b/library/persistence/mysql/persistence_mysql-safe.ecf
index 43e48a5..6620845 100644
--- a/library/persistence/mysql/persistence_mysql-safe.ecf
+++ b/library/persistence/mysql/persistence_mysql-safe.ecf
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/library/persistence/mysql/persistence_mysql.ecf b/library/persistence/mysql/persistence_mysql.ecf
index a572b69..661691b 100644
--- a/library/persistence/mysql/persistence_mysql.ecf
+++ b/library/persistence/mysql/persistence_mysql.ecf
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/library/persistence/sqlite/persistence_sqlite-safe.ecf b/library/persistence/sqlite/persistence_sqlite-safe.ecf
index 8d3d9ec..9f1a393 100644
--- a/library/persistence/sqlite/persistence_sqlite-safe.ecf
+++ b/library/persistence/sqlite/persistence_sqlite-safe.ecf
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/library/persistence/sqlite/persistence_sqlite.ecf b/library/persistence/sqlite/persistence_sqlite.ecf
index 365295e..8499442 100644
--- a/library/persistence/sqlite/persistence_sqlite.ecf
+++ b/library/persistence/sqlite/persistence_sqlite.ecf
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/library/persistence/sqlite/src/cms_node_storage_sqlite.e b/library/persistence/sqlite/src/cms_node_storage_sqlite.e
index 7f0dc80..5d9b150 100644
--- a/library/persistence/sqlite/src/cms_node_storage_sqlite.e
+++ b/library/persistence/sqlite/src/cms_node_storage_sqlite.e
@@ -47,7 +47,7 @@ feature -- Access: iterator
l_parameters: STRING_TABLE [ANY]
do
error_handler.reset
- log.write_information (generator + ".nodes_iterator")
+ write_information_log (generator + ".nodes_iterator")
create l_parameters.make (0)
sql_query (select_nodes, l_parameters)
create Result.make (db_handler, agent fetch_node)
@@ -61,7 +61,7 @@ feature -- Access: iterator
do
-- FIXME: check implementation...
error_handler.reset
- log.write_information (generator + ".recent_nodes_iterator")
+ write_information_log (generator + ".recent_nodes_iterator")
create l_parameters.make (2)
l_parameters.put (a_rows, "rows")
l_parameters.put (a_lower, "offset")
diff --git a/src/modules/basic_auth/filter/basic_auth_filter.e b/src/modules/basic_auth/filter/basic_auth_filter.e
index 0659cb6..158d4be 100644
--- a/src/modules/basic_auth/filter/basic_auth_filter.e
+++ b/src/modules/basic_auth/filter/basic_auth_filter.e
@@ -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
diff --git a/src/modules/node/node_module.e b/src/modules/node/node_module.e
index 91cdc52..11c86cb 100644
--- a/src/modules/node/node_module.e
+++ b/src/modules/node/node_module.e
@@ -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 ("Nodes:
")
diff --git a/src/persistence/cms_storage_null.e b/src/persistence/cms_storage_null.e
index a9cfb95..e13e349 100644
--- a/src/persistence/cms_storage_null.e
+++ b/src/persistence/cms_storage_null.e
@@ -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)
diff --git a/src/persistence/node/cms_node_storage_sql.e b/src/persistence/node/cms_node_storage_sql.e
index 8d83ef5..42f7c5f 100644
--- a/src/persistence/node/cms_node_storage_sql.e
+++ b/src/persistence/node/cms_node_storage_sql.e
@@ -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")
diff --git a/src/persistence/user/cms_user_storage_sql.e b/src/persistence/user/cms_user_storage_sql.e
index 72e45f8..b98ef69 100644
--- a/src/persistence/user/cms_user_storage_sql.e
+++ b/src/persistence/user/cms_user_storage_sql.e
@@ -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)
diff --git a/src/service/logger/cms_env_logger.e b/src/service/logger/cms_env_logger.e
index ebb4c58..8f91331 100644
--- a/src/service/logger/cms_env_logger.e
+++ b/src/service/logger/cms_env_logger.e
@@ -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