diff --git a/.gitignore b/.gitignore index 20a9f65..109689c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .vscode -example/* +example test/*.o \ No newline at end of file diff --git a/example/2023-05-21.log b/example/2023-05-21.log deleted file mode 100644 index 0946989..0000000 --- a/example/2023-05-21.log +++ /dev/null @@ -1 +0,0 @@ -23:08:58 [EVENT] Start loging diff --git a/example/2023-07-27.log b/example/2023-07-27.log deleted file mode 100644 index c31f511..0000000 --- a/example/2023-07-27.log +++ /dev/null @@ -1,3 +0,0 @@ -18:29:30 [EVENT] Start loging -18:29:44 [EVENT] Start loging -18:29:47 [EVENT] Start loging diff --git a/example/2023-5-20.log b/example/2023-5-20.log deleted file mode 100644 index 67c05ea..0000000 --- a/example/2023-5-20.log +++ /dev/null @@ -1,5 +0,0 @@ -[EVENT] Start loging -[EVENT] Start loging -10:58:12 [EVENT] Start loging -10:59:19 [EVENT] Start loging -11:00:17 [EVENT] Start loging diff --git a/example/2023-5-21.log b/example/2023-5-21.log deleted file mode 100644 index 180c471..0000000 --- a/example/2023-5-21.log +++ /dev/null @@ -1,2 +0,0 @@ -11:00:58 [EVENT] Start loging -13:02:17 [EVENT] Start loging diff --git a/lib/log.hpp b/lib/log.hpp index a90ebbb..a13c1c2 100644 --- a/lib/log.hpp +++ b/lib/log.hpp @@ -14,6 +14,7 @@ typedef unsigned int uint; #endif namespace marcelb { +namespace logging { using namespace std; @@ -116,6 +117,7 @@ class log { ~log(); }; +} } #endif \ No newline at end of file diff --git a/src/log.cpp b/src/log.cpp index 0bf6bfa..8d6867a 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -1,6 +1,9 @@ #include "../lib/log.hpp" -marcelb::log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole) { +namespace marcelb { +namespace logging { + +log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole) { dir = _dir; loglevel = _loglevel; isKeepOpen = _isKeepOpen; @@ -22,28 +25,28 @@ marcelb::log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInC } -bool marcelb::log::isdir() { +bool log::isdir() { struct stat sb; return stat(dir.c_str(), &sb) == 0; } -bool marcelb::log::open() { +bool log::open() { logfile = ofstream (path, ios_base::app); return logfile.is_open(); } -void marcelb::log::loose() { +void log::loose() { logfile.close(); } -void marcelb::log::setMoment() { +void log::setMoment() { time_t rawtime; time (&rawtime); moment = localtime (&rawtime); } -void marcelb::log::put(string logline, Level _level) { +void log::put(string logline, Level _level) { if (_level < loglevel) { return; } @@ -83,7 +86,7 @@ void marcelb::log::put(string logline, Level _level) { } -void marcelb::log::setPath() { +void log::setPath() { if (dir[dir.length()-1] != '/') { dir.push_back('/'); } @@ -94,7 +97,7 @@ void marcelb::log::setPath() { path = dir + to_string(moment->tm_year+1900) + '-' + mon.str() + '-' + _day.str() + ".log"; } -void marcelb::log::setPrefix(string &logline, Level &_level) { +void log::setPrefix(string &logline, Level &_level) { stringstream hour, min, sec; hour << setw(2) << setfill('0') << moment->tm_hour; min << setw(2) << setfill('0') << moment->tm_min; @@ -125,28 +128,31 @@ void marcelb::log::setPrefix(string &logline, Level &_level) { logline = _logline + logline; } -void marcelb::log::debug(string logline) { +void log::debug(string logline) { put(logline, DEBUG); } -void marcelb::log::info(string logline) { +void log::info(string logline) { put(logline, INFO); } -void marcelb::log::warning(string logline) { +void log::warning(string logline) { put(logline, WARNING); } -void marcelb::log::error(string logline) { +void log::error(string logline) { put(logline, ERROR); } -void marcelb::log::fatal(string logline) { +void log::fatal(string logline) { put(logline, FATAL); } -marcelb::log::~log() { +log::~log() { loose(); } + +} +} diff --git a/test/test.cpp b/test/test.cpp index 7e27e24..c2ebe73 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,9 +3,9 @@ #include "../lib/log.hpp" using namespace std; -using namespace marcelb; +using namespace marcelb::logging; -log mylog("../example", Level::FATAL, false); +log mylog("../example", Level::INFO, false); int main() { mylog.debug("Start debug loging"); diff --git a/test/test.o b/test/test.o deleted file mode 100755 index f09cdcb..0000000 Binary files a/test/test.o and /dev/null differ