From cfcf018e648b09b76a6ffeefaf47e0cb5b5bd92e Mon Sep 17 00:00:00 2001 From: totoro Date: Tue, 3 Dec 2019 11:21:24 +0100 Subject: [PATCH] remove dependency to logger_service --- database/migration.anubis | 2 +- database/migration_common.anubis | 2 +- mail/send_mail.anubis | 13 ++++++------- os_tools/freebsd/rc_conf.anubis | 2 +- web/CXM_dojo.anubis | 2 +- web/CXM_making_a_web_site.anubis | 8 ++++---- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/database/migration.anubis b/database/migration.anubis index f770208..9f660c9 100644 --- a/database/migration.anubis +++ b/database/migration.anubis @@ -14,7 +14,7 @@ read data_base/db_tools.anubis read calexium_lib/database/db_utils.anubis read calexium_lib/database/alter_table.anubis -read calexium_lib/net_services_protocols/logger_service.anubis +//read calexium_lib/net_services_protocols/logger_service.anubis read mf_constants.anubis diff --git a/database/migration_common.anubis b/database/migration_common.anubis index f3d97d5..9bf8da9 100644 --- a/database/migration_common.anubis +++ b/database/migration_common.anubis @@ -13,7 +13,7 @@ read alter_table.anubis read sqlite_foreign_key.anubis read calexium_lib/database/db_utils.anubis -read calexium_lib/net_services_protocols/logger_service.anubis +//read calexium_lib/net_services_protocols/logger_service.anubis public type DbTable: diff --git a/mail/send_mail.anubis b/mail/send_mail.anubis index eaca1bc..5316c1b 100644 --- a/mail/send_mail.anubis +++ b/mail/send_mail.anubis @@ -15,10 +15,9 @@ read network/tools.anubis read system/files.anubis read system/string.anubis read system/data_io.anubis -read system/logger.anubis -read calexium_lib/net_services_protocols/logger_service.anubis read calexium_lib/mail/send_mail_type.anubis +read calexium_lib/net_services_protocols/logger_client.anubis read lexers/enhanced_status.anubis read smtp_server_extensions.anubis @@ -210,8 +209,8 @@ public define Result(SmtpClientResult, One) param, prepare_mail_callback, (Int _) |-> unique, - (LogLevel level, String txt) |-> if level is logTrace then logTrace(send_mail_log, send_mail_mask, txt) - else log(level, send_mail_log, txt), + (LogLevel level, String txt) |-> if level is logTrace then logTrace(send_mail_log, send_mail_log, send_mail_mask, txt) + else log(send_mail_log, level, send_mail_log, txt), handle_result ). @@ -239,17 +238,17 @@ public define Result(SmtpClientResult, One) { failure then println("IP address NOT found for Mail server ["+server+"]"); - logWarning(send_mail_log,"IP address NOT found for Mail server ["+server+"]"); + logWarning(send_mail_log, send_mail_log,"IP address NOT found for Mail server ["+server+"]"); error(error), success(ip_addr) then with ip_txt = ip_addr_to_string(ip_addr), - logTrace(send_mail_log, send_mail_mask, "send_mail: Trying to connect to "+ip_txt); + logTrace(send_mail_log, send_mail_log, send_mail_mask, "send_mail: Trying to connect to "+ip_txt); println("send_mail: Trying to connect to "+ip_txt); if (Result(NetworkConnectError,RWStream))connect(ip_addr, port) is { error(e) then - logTrace(send_mail_log, send_mail_mask, "send_mail: Can't connect to "+ip_txt); + logTrace(send_mail_log, send_mail_log, send_mail_mask, "send_mail: Can't connect to "+ip_txt); error(error), ok(server_conn) then diff --git a/os_tools/freebsd/rc_conf.anubis b/os_tools/freebsd/rc_conf.anubis index c0a7ea2..86662e0 100644 --- a/os_tools/freebsd/rc_conf.anubis +++ b/os_tools/freebsd/rc_conf.anubis @@ -14,7 +14,7 @@ read system/string.anubis read tools/basis.anubis //read tools/app_loggers.anubis read tools/streams.anubis -read calexium_lib/net_services_protocols/logger_service.anubis +//read calexium_lib/net_services_protocols/logger_service.anubis delete_entry find_entry diff --git a/web/CXM_dojo.anubis b/web/CXM_dojo.anubis index 7140261..dbc117c 100644 --- a/web/CXM_dojo.anubis +++ b/web/CXM_dojo.anubis @@ -15,7 +15,7 @@ read system/logger.anubis read calexium_lib/web/CXM_common.anubis read calexium_lib/web/CXM_making_a_web_site.anubis read calexium_lib/web/CXM_multihost_http_server.anubis -read calexium_lib/net_services_protocols/logger_service.anubis + read calexium_lib/net_services_protocols/logger_service.anubis public type Dojo_Grid_Data : grid_data(String). diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 3e66ca0..b671345 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -3081,7 +3081,7 @@ public define One String ssl_certificate_common_name, List(Web_Site) web_sites, // web sites to be started (One) -> Bool shutdown_required, - Logger log //logger where to report the error + (LogLevel, String) -> One logger //logger where to report the error )= if (Start_Web_Sites_Result)start_web_sites(ip_address, http_port, @@ -3090,9 +3090,9 @@ public define One web_sites, shutdown_required) is { - cannot_bind_to_port(n) then logError(log, "Cannot bind to port: "+n), - cannot_bind_to_port(n,m) then logError(log, "Cannot bind to ports: "+n+", "+m), - ok(s1,s2) then logInfo(log, "Servers started on ports "+http_port+" (HTTP) and "+https_port+" (HTTPS).") + cannot_bind_to_port(n) then logger(logError, "Cannot bind to port: "+n), + cannot_bind_to_port(n,m) then logger(logError, "Cannot bind to ports: "+n+", "+m), + ok(s1,s2) then logger(logInfo, "Servers started on ports "+http_port+" (HTTP) and "+https_port+" (HTTPS).") }. -- libgit2 0.21.4