Logs: Quito macro y mejoro errores

src/commons/error.c

@@ -16,23 +16,19 @@
 
 #include "error.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "string.h"
 
-
 void error_show(char *message, ...) {
 	va_list arguments;
 	va_start(arguments, message);
-
-	char *error_message = string_duplicate("[[ERROR]]");
-	string_append(&error_message, message);
-
-	vprintf(error_message, arguments);
-
+	char *error_message = string_from_format("[[ERROR]] %s: %s\n", message, strerror(errno));
+	vfprintf(stderr, error_message, arguments);
 	free(error_message);
 	va_end(arguments);
 }

src/commons/error.h

@@ -22,7 +22,7 @@
 	* @brief imprime un mensaje con el siguiente formato
 	* 	     [[ERROR]] MESSAGE
 	*/
-	void error_show(char *message, ...);
+	void error_show(char *message, ...) __attribute__((format(printf, 1, 2)));
 
 	/** @endcond */
 

src/commons/log.c

@@ -24,26 +24,19 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include <stdarg.h>
+
 
 #define LOG_ENUM_SIZE 5
 
 static char *enum_names[LOG_ENUM_SIZE] = {"TRACE", "DEBUG", "INFO", "WARNING", "ERROR"};
 static char *log_colors[LOG_ENUM_SIZE] = {"\x1b[36m", "\x1b[32m", "", "\x1b[33m", "\x1b[31m" };
 static char *reset_color = "\x1b[0m";
+
 /**
  * Private Functions
  */
 static void _log_write_in_level(t_log* logger, t_log_level level, const char* message_template, va_list arguments);
-static bool _isEnableLevelInLogger(t_log* logger, t_log_level level);
-
-#define log_impl_template(log_function, level_enum) 									\
-		void log_function(t_log* logger, const char* message_template, ...) { 			\
-			va_list arguments;															\
-			va_start(arguments, message_template);										\
-			_log_write_in_level(logger, level_enum, message_template, arguments);		\
-			va_end(arguments);															\
-		}																				\
+static bool _is_level_enabled(t_log* logger, t_log_level level);
 
 /**
  * Public Functions
@@ -54,7 +47,7 @@ t_log* log_create(char* file, char *program_name, bool is_active_console, t_log_
 	t_log* logger = malloc(sizeof(t_log));
 
 	if (logger == NULL) {
-		perror("Cannot create logger");
+		error_show("Cannot create logger");
 		return NULL;
 	}
 
@@ -64,7 +57,7 @@ t_log* log_create(char* file, char *program_name, bool is_active_console, t_log_
 		file_opened = txt_open_for_append(file);
 
 		if (file_opened == NULL) {
-			perror("Cannot create/open log file");
+			error_show("Cannot create/open log file");
 			free(logger);
 			return NULL;
 		}
@@ -84,15 +77,40 @@ void log_destroy(t_log* logger) {
 	free(logger);
 }
 
-log_impl_template(log_trace, LOG_LEVEL_TRACE);
+void log_trace(t_log* logger, const char* message_template, ...) {
+	va_list arguments;
+	va_start(arguments, message_template);
+	_log_write_in_level(logger, LOG_LEVEL_TRACE, message_template, arguments);
+	va_end(arguments);
+}
 
-log_impl_template(log_debug, LOG_LEVEL_DEBUG);
+void log_debug(t_log* logger, const char* message_template, ...) {
+	va_list arguments;
+	va_start(arguments, message_template);
+	_log_write_in_level(logger, LOG_LEVEL_DEBUG, message_template, arguments);
+	va_end(arguments);
+}
 
-log_impl_template(log_info, LOG_LEVEL_INFO);
+void log_info(t_log* logger, const char* message_template, ...) {
+	va_list arguments;
+	va_start(arguments, message_template);
+	_log_write_in_level(logger, LOG_LEVEL_INFO, message_template, arguments);
+	va_end(arguments);
+}
 
-log_impl_template(log_warning, LOG_LEVEL_WARNING);
+void log_warning(t_log* logger, const char* message_template, ...) {
+	va_list arguments;
+	va_start(arguments, message_template);
+	_log_write_in_level(logger, LOG_LEVEL_WARNING, message_template, arguments);
+	va_end(arguments);
+}
 
-log_impl_template(log_error, LOG_LEVEL_ERROR);
+void log_error(t_log* logger, const char* message_template, ...) {
+	va_list arguments;
+	va_start(arguments, message_template);
+	_log_write_in_level(logger, LOG_LEVEL_ERROR, message_template, arguments);
+	va_end(arguments);
+}
 
 char *log_level_as_string(t_log_level level) {
 	return enum_names[level];
@@ -103,9 +121,7 @@ char *log_level_color(t_log_level level) {
 }
 
 t_log_level log_level_from_string(char *level) {
-	int i;
-
-	for (i = 0; i < LOG_ENUM_SIZE; i++) {
+	for (int i = 0; i < LOG_ENUM_SIZE; i++) {
 		if (string_equals_ignore_case(level, enum_names[i])){
 			return i;
 		}
@@ -117,42 +133,40 @@ t_log_level log_level_from_string(char *level) {
 /** PRIVATE FUNCTIONS **/
 
 static void _log_write_in_level(t_log* logger, t_log_level level, const char* message_template, va_list list_arguments) {
+	if (!_is_level_enabled(logger, level)) {
+		return;
+	}
 
-	if (_isEnableLevelInLogger(logger, level)) {
-		char *message, *time, *buffer, *console_buffer;
-		unsigned int thread_id;
-
-		message = string_from_vformat(message_template, list_arguments);
-		time = temporal_get_string_time("%H:%M:%S:%MS");
-		thread_id = process_get_thread_id();
-
-		buffer = string_from_format("[%s] %s %s/(%d:%d): %s\n",
-			log_level_as_string(level),
-			time,
-			logger->program_name,
-			logger->pid,
-			thread_id,
-			message);
+	char *message = string_from_vformat(message_template, list_arguments);
+	char *time = temporal_get_string_time("%H:%M:%S:%MS");
+	unsigned int thread_id = process_get_thread_id();
 
-		if (logger->file != NULL) {
-			txt_write_in_file(logger->file, buffer);
-		}
+	char *buffer = string_from_format("[%s] %s %s/(%d:%d): %s\n",
+		log_level_as_string(level),
+		time,
+		logger->program_name,
+		logger->pid,
+		thread_id,
+		message);
 
-		if (logger->is_active_console) {
-			console_buffer = string_from_format("%s%s%s",
-				log_level_color(level),
-				buffer,
-				reset_color);
-			txt_write_in_stdout(console_buffer);
-			free(console_buffer);
-		}
+	if (logger->file != NULL) {
+		txt_write_in_file(logger->file, buffer);
+	}
 
-		free(time);
-		free(message);
-		free(buffer);
+	if (logger->is_active_console) {
+		char *console_buffer = string_from_format("%s%s%s",
+			log_level_color(level),
+			buffer,
+			reset_color);
+		txt_write_in_stdout(console_buffer);
+		free(console_buffer);
 	}
+
+	free(time);
+	free(message);
+	free(buffer);
 }
 
-static bool _isEnableLevelInLogger(t_log* logger, t_log_level level) {
+static bool _is_level_enabled(t_log* logger, t_log_level level) {
 	return level >= logger->detail;
 }