remove csvformatter

Author: epezent

cmake/MELSources.cmake

@@ -103,7 +103,6 @@ list(APPEND MEL_LOGGING_HEADERS
     "${MEL_LOGGING_HEADERS_DIR}/Table.hpp"
     "${MEL_LOGGING_HEADERS_DIR}/Detail/Csv.inl"
     "${MEL_LOGGING_HEADERS_DIR}/Detail/StreamMeta.hpp"
-    "${MEL_LOGGING_HEADERS_DIR}/Formatters/CsvFormatter.hpp"
     "${MEL_LOGGING_HEADERS_DIR}/Formatters/FuncMessageFormatter.hpp"
     "${MEL_LOGGING_HEADERS_DIR}/Formatters/MessageOnlyFormatter.hpp"
     "${MEL_LOGGING_HEADERS_DIR}/Formatters/TxtFormatter.hpp"

examples/CMakeLists.txt

@@ -10,7 +10,7 @@ mel_example(options)
 mel_example(pid)
 mel_example(lockables)
 mel_example(ring_buffer)
-mel_example(logger)
+mel_example(log)
 mel_example(melscope)
 mel_example(math)
 mel_example(shared_memory)

examples/ex_logger.cpp renamed to examples/ex_log.cpp

@@ -75,20 +75,22 @@ int main() {
     LOG(Fatal) << "This is a Fatal log";      // goes to MEL.log and console
 
     /// You can change the max severiy of the default logger
-    MEL_LOGGER->set_max_severity(Debug);
+    MEL_LOG->set_max_severity(Debug);
 
     LOG(Debug) << "This is another Debug log";      // goes to MEL.log and console
     LOG(Verbose) << "This is another Verbose log";  // goes to MEL.log and console
 
+    //==========================================================================
+
     // You can create your own loggers too. First you need to choose a
     // Formatter. A Formatter is responsible for taking a log record and turning
     // it into a string. There are several built-in Formatters, and you can even
-    // create your own. Here, we will use the built-in CsvFormatter. Once you've
+    // create your own. Here, we will use the built-in TxtFormatter. Once you've
     // chosen a Formatter, you create a Writer. A Writer is responsible for
     // taking a formatted string from a Formatter and writing it in some
     // prescribed manner, either to the console, a file, memory, etc. Here we
     // will choose the built int RollingFileWriter.
-    RollingFileWriter<CsvFormatter> file_writer("my_log.csv");
+    RollingFileWriter<TxtFormatter> file_writer("my_log.txt");
     // Now, we create the actual Logger. Loggers are paramertized with an
     // integer which can be an enum for convienence. The default logger is 0, so
     // custom loggers should start at 1 or some other number.

include/MEL/Logging/Formatters/CsvFormatter.hpp

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <MEL/Logging/Formatters/CsvFormatter.hpp>
 #include <MEL/Logging/Formatters/TxtFormatter.hpp>
 #include <MEL/Logging/Writers/ColorConsoleWriter.hpp>
 #include <MEL/Logging/Writers/RollingFileWriter.hpp>
@@ -26,7 +25,7 @@
 #include <cstring>
 #include <vector>
 
-#ifndef DEFAULT_MEL_LOGGER
+#ifndef DEFAULT_MEL_LOG
 #define DEFAULT_LOGGER 0
 #endif
 
@@ -124,31 +123,25 @@ inline Logger<instance>& init_logger(Severity max_severity,
     return init_logger<instance>(max_severity, &rollingFilewriter);
 }
 
-/// Initializes a logger with RollingFileWriter and Txt/CsvFormatter chosen by
-/// file extension (specific logger instance)
+/// Initializes a logger with RollingFileWriter and TxtFormatter
 template <int instance>
 inline Logger<instance>& init_logger(Severity max_severity,
                          const char* filename,
                          size_t max_file_size = 0,
                          int max_files = 0) {
-    const char* dot = std::strrchr(filename, '.');
-    if (dot && 0 == std::strcmp(dot, ".csv"))
-        return init_logger<CsvFormatter, instance>(max_severity, filename,
-            max_file_size, max_files);
-    else
-        return init_logger<TxtFormatter, instance>(max_severity, filename,
-            max_file_size, max_files);
+    return init_logger<TxtFormatter, instance>(max_severity, filename,
+        max_file_size, max_files);
 }
 
 //==============================================================================
 // DEFAULT MEL LOGGER
 //==============================================================================
 
-/// Built in MEL Logger. Contains two writers: (0) a RollingFileWriter with a
+/// Built in MEL Log. Contains two writers: (0) a RollingFileWriter with a
 /// TxtFormatter and default severity Verbose, and (1) a ColorConsoleWriter with
 /// TxtFormatter and default severity Info. Can be disabled by defining
 /// MEL_DISABLE_LOG or enabling DISABLE_LOG option in CMakeLists.txt
-extern Logger<DEFAULT_LOGGER>* MEL_LOGGER;
+extern Logger<DEFAULT_LOGGER>* MEL_LOG;
 
 }  // namespace mel
 
@@ -177,14 +170,14 @@ extern Logger<DEFAULT_LOGGER>* MEL_LOGGER;
 
 /// Log severity level checker for default MEL logger
 #define IF_LOG(severity)                                        \
-    if (!MEL_LOGGER || !MEL_LOGGER->check_severity(severity)) { \
+    if (!MEL_LOG || !MEL_LOG->check_severity(severity)) { \
         ;                                                       \
     } else
 
 /// Main logging macro for defaulter MEL logger
 #define LOG(severity) \
     IF_LOG(severity)  \
-        *MEL_LOGGER += LogRecord(severity, LOG_GET_FUNC(), __LINE__, LOG_GET_FILE())
+        *MEL_LOG += LogRecord(severity, LOG_GET_FUNC(), __LINE__, LOG_GET_FILE())
 
 /// Conditional logging macro for default MEL logger
 #define LOG_IF(severity, condition) \

include/MEL/Logging/Log.hpp

@@ -17,7 +17,6 @@
 
 #pragma once
 
-
 namespace mel {
 
 /// Represents a logging severity level

include/MEL/Logging/Severity.hpp

@@ -4,9 +4,9 @@ namespace mel {
 
 #ifndef MEL_DISABLE_LOG
     static ColorConsoleWriter<TxtFormatter> default_console_writer(Info);
-    Logger<DEFAULT_LOGGER>* MEL_LOGGER = &init_logger<DEFAULT_LOGGER>(Verbose, "MEL.log", 256000, 10).add_writer(&default_console_writer);
+    Logger<DEFAULT_LOGGER>* MEL_LOG = &init_logger<DEFAULT_LOGGER>(Verbose, "MEL.log", 256000, 10).add_writer(&default_console_writer);
 #else
-    Logger<DEFAULT_LOGGER>* MEL_LOGGER = nullptr;
+    Logger<DEFAULT_LOGGER>* MEL_LOG = nullptr;
 #endif
 
 } // namespace mel