tests(gorgone): use gorgone log format to fix automated tests

Refs:MON-106121
centreon · Nov 26, 2024 · 0bb4f11 · 0bb4f11
1 parent 6afc638
commit 0bb4f11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/gorgone/tests/robot/resources/LogResearch.py b/gorgone/tests/robot/resources/LogResearch.py
@@ -129,7 +129,7 @@ def ctn_find_in_log(log: str, date, content, regex=False):
 
 
 def ctn_extract_date_from_log(line: str):
-    p = re.compile(r"^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]")
+    p = re.compile(r"^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})")
     m = p.match(line)
     if m is None:
         return None

diff --git a/gorgone/tests/robot/resources/resources.resource b/gorgone/tests/robot/resources/resources.resource
@@ -189,7 +189,7 @@ Wait Until Port Is Bind
 
 Ctn Check No Error In Logs
     [Arguments]    ${gorgone_id}
-    ${cmd}=    Set Variable     grep -vP '^\\[\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\] ' /var/log/centreon-gorgone/${gorgone_id}/gorgoned.log
+    ${cmd}=    Set Variable     grep -vP '^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} ' /var/log/centreon-gorgone/${gorgone_id}/gorgoned.log
     Log To Console    \n\n${cmd}\n\n
 
     ${log_line_wrong}    RUN    ${cmd}

diff --git a/perl-libs/lib/centreon/common/logger.pm b/perl-libs/lib/centreon/common/logger.pm
@@ -234,12 +234,14 @@ sub writeLog($$$%) {
 
     # do nothing if the configured severity does not imply logging this message
     return if ($self->{severity} < $severity);
+    if (length($msg) > 20000) {
+        $msg = substr($msg, 0, 20000) . '...';
+    }
+    $msg = ($self->withpid()) ? "$$ - $msg" : $msg;
 
-    $msg = ($self->withpid()) ? "[$$] $msg" : $msg;
-
-    my $datedmsg = "[" . $human_severities{$severity} . "] " . $msg . "\n";
+    my $datedmsg = $human_severities{$severity} . " - " . $msg . "\n";
     if ($self->withdate()) {
-        $datedmsg = "[" . $self->get_date . "] " . $datedmsg;
+        $datedmsg = $self->get_date . " - " . $datedmsg;
     }
     if ($self->{log_mode} == 1 and defined($self->{filehandler})) {
         print {$self->{filehandler}} $datedmsg;