diff --git a/.gitignore b/.gitignore index d163863..647240d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -build/ \ No newline at end of file +build/ +logs/*.log \ No newline at end of file diff --git a/LLog.c b/LLog.c index c69a74b..e732a20 100644 --- a/LLog.c +++ b/LLog.c @@ -27,6 +27,30 @@ int lLogString_array_append(lLogString_array* array, lLogString* string) { return array->count - 1; } +Logger* Logger_new(lLogString* logfolder, int history_enabled) { + Logger* logger = calloc(1, sizeof(Logger)); + logger->historyEnabled = history_enabled; + logger->logFileEnabled = 1; + + time_t time_now = time(NULL); + char file_name[64]; + + strftime(file_name, sizeof(file_name), "%Y-%m-%d--%H:%M:%S.log", localtime(&time_now)); + + lLogString* logFile = lLogString_new("%.*s/%s", (int)logfolder->len, logfolder->buf, file_name); + logger->log_file = fopen(logFile->buf, "a"); + + if (logger->log_file == NULL) { + logger->logFileEnabled = 0; + lLog(logger, + lERROR, + lLogString_new("Could not open log file: \"%.*s\" Continuing without log file.", (int)logFile->len, logFile->buf) + ); + } + + return logger; +} + int create_timer(Logger* logger) { return timer_array_append(&logger->timers, (lTimer){}); } @@ -61,13 +85,23 @@ lLogString* lLogString_new(const char* fmt, ...) { return str; }; +int Logger_write_to_log(Logger* logger, lLogString* string) { + if (logger->logFileEnabled == 0 || logger->log_file == NULL) return 1; + fprintf(logger->log_file, "%.*s", (int)string->len, string->buf); + + return 0; +} + int lLog(Logger* logger, enum lLogLevel LOG_LEVEL, lLogString* MESSAGE) { char* LOG_LEVEL_STRING = LOG_LEVEL == 0 ? "INFO" : LOG_LEVEL == 1 ? "WARNING" : LOG_LEVEL == 2 ? "ERROR" : LOG_LEVEL == 3 ? "DEBUG" : "invalid_log_level"; - - printf("[%s]: %.*s\n", LOG_LEVEL_STRING, (int)MESSAGE->len, MESSAGE->buf); - return lLogString_array_append(&logger->history, MESSAGE); + lLogString* formated_message = lLogString_new("[%s]: %.*s\n", LOG_LEVEL_STRING, (int)MESSAGE->len, MESSAGE->buf); + + if (logger->logFileEnabled) Logger_write_to_log(logger, formated_message); + printf("%.*s", (int)formated_message->len, formated_message->buf); + + return lLogString_array_append(&logger->history, formated_message); } \ No newline at end of file diff --git a/include/LLog.h b/include/LLog.h index a526228..73d574f 100644 --- a/include/LLog.h +++ b/include/LLog.h @@ -3,6 +3,7 @@ #include "time.h" #include +#include #define max_string_len 1024 @@ -42,10 +43,14 @@ typedef struct { int lLogString_array_append(lLogString_array* array, lLogString* string); typedef struct { - lLogString logfolder; + FILE* log_file; timer_array timers; + int historyEnabled; + int logFileEnabled; lLogString_array history; + } Logger; +Logger* Logger_new(lLogString* logfolder, int history_enabled); int create_timer(Logger* logger); void start_timer(Logger* logger, int timer_id); diff --git a/logs/temp b/logs/temp new file mode 100644 index 0000000..e69de29 diff --git a/test/test.c b/test/test.c index 9217bb2..239593e 100644 --- a/test/test.c +++ b/test/test.c @@ -2,20 +2,20 @@ #include int main(void) { - Logger logger = {0}; - int message_1_id = lLog(&logger, lINFO, lLogString_new("Hello, INFO!")); - lLog(&logger, lINFO, logger.history.items[message_1_id]); + Logger* logger = Logger_new(lLogString_new("./logs"), 1); + lLog(logger, lINFO, lLogString_new("Hello, INFO!")); - int message_2_id = lLog(&logger, lWARNING, lLogString_new("Hello, WARNING!")); - int message_3_id = lLog(&logger, lERROR, lLogString_new("Hello, ERROR!")); - int message_4_id = lLog(&logger, lDEBUG, lLogString_new("Hello, DEBUG!")); + lLog(logger, lWARNING, lLogString_new("Hello, WARNING!")); + lLog(logger, lERROR, lLogString_new("Hello, ERROR!")); + lLog(logger, lDEBUG, lLogString_new("Hello, DEBUG!")); - int timer = create_timer(&logger); - lTimespan* time_object = &logger.timers.items[timer].time; - start_timer(&logger, timer); + int timer = create_timer(logger); + lTimespan* time_object = &logger->timers.items[timer].time; + start_timer(logger, timer); sleep(2); - stop_timer(&logger, timer); - lLog(&logger, lINFO, lLogString_new("%f seconds.", difftime(time_object->end, time_object->start))); + stop_timer(logger, timer); + + lLog(logger, lINFO, lLogString_new("%f seconds.", difftime(time_object->end, time_object->start))); } \ No newline at end of file