X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Flog.cc;h=d0acf2e103334e98c99a562b8688b2f644c0a9aa;hp=f9a3ad97d3c397b4a21e33b4793ca8bcea021622;hb=6c9943707d4f33035830eba0587a61a34eaecbc2;hpb=6f1b787a10d8ab1a3117a4b8c004dd2d90599608 diff --git a/src/moof/log.cc b/src/moof/log.cc index f9a3ad9..d0acf2e 100644 --- a/src/moof/log.cc +++ b/src/moof/log.cc @@ -14,7 +14,7 @@ #if !defined(__WIN32) #include #else -int isatty(int dummy) { return 0; } +inline int isatty(int dummy) { return 0; } #endif @@ -48,14 +48,16 @@ log::log(enum level level) : case log::error: prefix_ = " error: "; break; case log::warning: prefix_ = "warning: "; break; case log::info: prefix_ = " info: "; break; + case log::debug: prefix_ = " debug: "; break; case log::none: break; } else switch (level) { - case log::error: prefix_ = "\033[101m error: "; break; - case log::warning: prefix_ = "\033[103mwarning: "; break; - case log::info: prefix_ = " info: "; break; + case log::error: prefix_ = "\033[30;101m error: "; break; + case log::warning: prefix_ = "\033[30;103mwarning: "; break; + case log::info: prefix_ = " info: "; break; + case log::debug: prefix_ = "\033[2m debug: "; break; case log::none: break; } } @@ -79,14 +81,24 @@ std::ostream& log(std::cout); static std::ofstream null_log_; std::ostream& null_log(null_log_); -class log log_error( log::error); -class log log_warning(log::warning); -class log log_info( log::info); + +// These objects are intentionally not deconstructed so that logging will +// still be available after this module has been cleaned up. +class log& log_error(*new class log(log::error)); +class log& log_warning(*new class log(log::warning)); +class log& log_info(*new class log(log::info)); +class log& log_debug(*new class log(log::debug)); static int log_script(script& script, enum log::level level) { - static class log* logs[] = {0, &log_error, &log_warning, &log_info}; + static class log* logs[] = { + 0, + &log_error, + &log_warning, + &log_info, + &log_debug + }; script::slot param = script[1]; @@ -109,6 +121,8 @@ void log::import(script& script) boost::bind(log_script, _1, log::info)); script.import_function("print", boost::bind(log_script, _1, log::info)); + script.import_function("LogDebug", + boost::bind(log_script, _1, log::debug)); }