From 348058c2240e50ac3d7f5a4e9bef8e78f5700b5e Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@gmail.com>
Date: Tue, 20 Nov 2018 12:18:36 -0500
Subject: [PATCH] Update log message formatting

---
 src/helper.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/helper.c b/src/helper.c
index 4a5fb87..f9a285d 100644
--- a/src/helper.c
+++ b/src/helper.c
@@ -143,11 +143,10 @@ void va_to_console(const char *s_file_name,
 
     // Create formatted string, with default formatting.
     format_string = calloc(MAX_LOG_STRING_LENGTH, sizeof(char*));
-    sprintf(format_string, "%s [%d-%d-%d %d:%d:%d] %s %d: %s\n",
-        log_level,
+    sprintf(format_string, "[%d-%d-%d %d:%d:%d] [%s] %s %d: %s\n",
         timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
         timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec,
-        s_file_name, s_line_num, s_format_string
+        log_level, s_file_name, s_line_num, s_format_string
     );
 
     // Print to console.
@@ -173,11 +172,10 @@ void va_to_info_file(const char *s_file_name,
 
     // Create initial formatted string, with default formatting.
     format_string = calloc_or_quit(MAX_LOG_STRING_LENGTH, sizeof(char*));
-    sprintf(format_string, "%s [%d-%d-%d %d:%d:%d] %s %d: %s\n",
-        log_level,
+    sprintf(format_string, "[%d-%d-%d %d:%d:%d] [%s] %s %d: %s\n",
         timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
         timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec,
-        s_file_name, s_line_num, s_format_string
+        log_level, s_file_name, s_line_num, s_format_string
     );
 
     // Save to log file.
@@ -205,11 +203,10 @@ void va_to_warn_file(const char *s_file_name,
 
     // Create initial formatted string, with default formatting.
     format_string = calloc_or_quit(MAX_LOG_STRING_LENGTH, sizeof(char*));
-    sprintf(format_string, "%s [%d-%d-%d %d:%d:%d] %s %d: %s\n",
-        log_level,
+    sprintf(format_string, "[%d-%d-%d %d:%d:%d] [%s] %s %d: %s\n",
         timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
         timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec,
-        s_file_name, s_line_num, s_format_string
+        log_level, s_file_name, s_line_num, s_format_string
     );
 
     // Save to log file.
@@ -237,11 +234,10 @@ void va_to_error_file(const char *s_file_name,
 
     // Create initial formatted string, with default formatting.
     format_string = calloc_or_quit(MAX_LOG_STRING_LENGTH, sizeof(char*));
-    sprintf(format_string, "%s [%d-%d-%d %d:%d:%d] %s %d: %s\n",
-        log_level,
+    sprintf(format_string, "[%d-%d-%d %d:%d:%d] [%s] %s %d: %s\n",
         timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
         timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec,
-        s_file_name, s_line_num, s_format_string
+        log_level, s_file_name, s_line_num, s_format_string
     );
 
     // Save to log file.
-- 
GitLab