From 7643bc6170c5bc02d16117fe431aa80b9d857dae Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Tue, 19 Nov 2013 14:37:15 +0000
Subject: [PATCH] Fixed an issue with file dump writing after close. Added
 logging by ITTI support for other log levels.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4431 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 common/utils/itti/intertask_interface_dump.c |  1 +
 openair2/UTIL/LOG/log.c                      | 52 ++++++++++++++++----
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/common/utils/itti/intertask_interface_dump.c b/common/utils/itti/intertask_interface_dump.c
index 1b7deb1334..c1431e5353 100644
--- a/common/utils/itti/intertask_interface_dump.c
+++ b/common/utils/itti/intertask_interface_dump.c
@@ -588,6 +588,7 @@ void itti_dump_exit(void)
     if (dump_file != NULL)
     {
         fclose(dump_file);
+        dump_file = NULL;
     }
 }
 
diff --git a/openair2/UTIL/LOG/log.c b/openair2/UTIL/LOG/log.c
index 08ffd77435..31f6ae372a 100755
--- a/openair2/UTIL/LOG/log.c
+++ b/openair2/UTIL/LOG/log.c
@@ -645,7 +645,7 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
 #endif
 
 #if defined(ENABLE_ITTI)
-    if (level <= LOG_WARNING)
+    if (level <= LOG_DEBUG)
     {
         MessagesIds messages_id;
         MessageDef *message_p;
@@ -654,22 +654,56 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
 
         message_string_size = log_end - log_start;
 
-        if (level <= LOG_ERR)
+        switch (level)
         {
+          case LOG_EMERG:
+          case LOG_ALERT:
+          case LOG_CRIT:
+          case LOG_ERR:
             messages_id = ERROR_LOG;
-        }
-        else
-        {
+            break;
+
+          case LOG_WARNING:
             messages_id = WARNING_LOG;
+            break;
+
+          case LOG_NOTICE:
+            messages_id = NOTICE_LOG;
+            break;
+
+          case LOG_INFO:
+            messages_id = INFO_LOG;
+            break;
+
+          default:
+            messages_id = DEBUG_LOG;
+            break;
         }
         message_p = itti_alloc_new_message_sized(TASK_UNKNOWN, messages_id, message_string_size);
-        if (level <= LOG_ERR)
+        switch (level)
         {
+          case LOG_EMERG:
+          case LOG_ALERT:
+          case LOG_CRIT:
+          case LOG_ERR:
             message_msg_p = (char *) &message_p->msg.error_log;
-        }
-        else
-        {
+            break;
+
+          case LOG_WARNING:
             message_msg_p = (char *) &message_p->msg.warning_log;
+            break;
+
+          case LOG_NOTICE:
+            message_msg_p = (char *) &message_p->msg.notice_log;
+            break;
+
+          case LOG_INFO:
+            message_msg_p = (char *) &message_p->msg.info_log;
+            break;
+
+          default:
+            message_msg_p = (char *) &message_p->msg.debug_log;
+            break;
         }
         memcpy(message_msg_p, log_start, message_string_size);