tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BLT logging v2

v1
Brett 2023-07-21 22:21:09 -04:00
parent 0ba2254729
commit f325d7aa83
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/blt/std/logging.h
View File

@ -76,7 +76,7 @@ namespace blt::logging {
// this is not thread safe! // this is not thread safe!
bool ensureAlignment = false; bool ensureAlignment = false;
// should we log to file? // should we log to file?
bool logToFile = false; bool logToFile = true;
// should we log to console? // should we log to console?
bool logToConsole = true; bool logToConsole = true;
// where should we log? (empty for current binary directory) should end in a / if not empty! // where should we log? (empty for current binary directory) should end in a / if not empty!
@ -153,7 +153,7 @@ namespace blt::logging {
void setMaxFileSize(size_t fileSize); void setMaxFileSize(size_t fileSize);
} }
#define BLT_LOGGING_IMPLEMENTATION //#define BLT_LOGGING_IMPLEMENTATION
#ifdef BLT_LOGGING_IMPLEMENTATION #ifdef BLT_LOGGING_IMPLEMENTATION
#include <iostream> #include <iostream>
@ -223,14 +223,12 @@ namespace blt::logging {
class LogFileWriter { class LogFileWriter {
private: private:
std::string m_path; std::string m_path;
std::fstream* output; std::fstream* output = nullptr;
int currentLines = 0;
static constexpr int MAX_LINES = 100000;
public: public:
explicit LogFileWriter() = default; explicit LogFileWriter() = default;
void writeLine(const std::string& path, const std::string& line){ void writeLine(const std::string& path, const std::string& line){
if (path != m_path){ if (path != m_path || output == nullptr){
clear(); clear();
delete output; delete output;
output = new std::fstream(path, std::ios::out | std::ios::app); output = new std::fstream(path, std::ios::out | std::ios::app);
@ -243,15 +241,6 @@ namespace blt::logging {
output->clear(); output->clear();
} }
*output << line; *output << line;
currentLines++;
if (currentLines > MAX_LINES){
output->flush();
output->close();
currentLines = 0;
auto currentTime = system::getTimeStringFS();
delete(output);
output = new std::fstream(m_path + currentTime + ".log");
}
} }
void clear(){ void clear(){
@ -272,7 +261,7 @@ namespace blt::logging {
}; };
#define BLT_NOW() auto t = std::time(nullptr); auto now = std::localtime(&t) #define BLT_NOW() auto t = std::time(nullptr); auto now = std::localtime(&t)
#define BLT_ISO_YEAR(S) auto S = std::to_string(now->tm_year); \ #define BLT_ISO_YEAR(S) auto S = std::to_string(now->tm_year + 1900); \
S += '-'; \ S += '-'; \
S += ensureHasDigits(now->tm_mon, 2); \ S += ensureHasDigits(now->tm_mon, 2); \
S += '-'; \ S += '-'; \
@ -426,6 +415,19 @@ namespace blt::logging {
} }
}; };
std::string stripANSI(const std::string& str){
string_parser parser(str);
std::string out;
while (parser.has_next()){
char c = parser.next();
if (c == '\033'){
while (parser.has_next() && parser.next() != 'm');
} else
out += c;
}
return out;
}
void applyCFormatting(const std::string& format, std::string& output, va_list& args){ void applyCFormatting(const std::string& format, std::string& output, va_list& args){
// args must be copied because they will be consumed by the first vsnprintf // args must be copied because they will be consumed by the first vsnprintf
va_list args_copy; va_list args_copy;
@ -554,7 +556,7 @@ namespace blt::logging {
loggingFormat.currentRollover++; loggingFormat.currentRollover++;
} }
writer.writeLine(path, finalFormattedOutput); writer.writeLine(path, stripANSI(finalFormattedOutput));
} }
//std::cout.flush(); //std::cout.flush();