Browse Source

edit logging service

master
Jørgen Lien Sellæg 11 years ago
parent
commit
839949b7fe
  1. 3
      juci/juci.cc
  2. 16
      juci/logging.h
  3. 8
      juci/source.cc
  4. 3
      juci/window.cc

3
juci/juci.cc

@ -7,7 +7,8 @@ int main(int argc, char *argv[]) {
argv,
"no.sout.juci");
init_logging();
add_file_log("juci.log");
INFO("Logging initalized");
Window window;
return app->run(window);
}

16
juci/logging.h

@ -12,15 +12,11 @@
using namespace boost::log;
#define TRACE(x) BOOST_LOG_TRIVIAL(trace) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
#define DEBUG(x) BOOST_LOG_TRIVIAL(debug) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
#define INFO(x) BOOST_LOG_TRIVIAL(info) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
#define WARNING(x) BOOST_LOG_TRIVIAL(warning) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
#define ERROR(x) BOOST_LOG_TRIVIAL(error) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
#define FATAL(x) BOOST_LOG_TRIVIAL(fatal) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">\n";
void init_logging() {
add_file_log("juci.log");
}
#define TRACE(x) BOOST_LOG_TRIVIAL(trace) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define DEBUG(x) BOOST_LOG_TRIVIAL(debug) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define INFO(x) BOOST_LOG_TRIVIAL(info) << __func__ << "(" << __LINE__ << "): \"" x << "\"";
#define WARNING(x) BOOST_LOG_TRIVIAL(warning) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define ERROR(x) BOOST_LOG_TRIVIAL(error) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define FATAL(x) BOOST_LOG_TRIVIAL(fatal) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#endif // JUCI_LOGGING_H_

8
juci/source.cc

@ -5,9 +5,7 @@
#include <fstream>
#include <boost/timer/timer.hpp>
#include "notebook.h"
#define log( var ) \
std::cout << "source.cc (" << __LINE__ << ") " << #var << std::endl
#include "logging.h"
Source::Location::
Location(int line_number, int column_offset) :
@ -267,7 +265,9 @@ HighlightToken(clang::Token *token,
// Constructor for Controller
Source::Controller::Controller(const Source::Config &config,
Notebook::Controller *notebook) :
model_(config), notebook_(notebook) { }
model_(config), notebook_(notebook) {
INFO("Source Controller with childs constructed");
}
// Source::Controller::view()
// return shared_ptr to the view

3
juci/window.cc

@ -1,4 +1,5 @@
#include "window.h"
#include "logging.h"
Window::Window() :
window_box_(Gtk::ORIENTATION_VERTICAL),
@ -6,6 +7,7 @@ Window::Window() :
keybindings_(main_config_.keybindings_cfg()),
notebook_(this,keybindings(), main_config_.source_cfg(), main_config_.dir_cfg()),
menu_(keybindings()) {
INFO("Creating window");
set_title("juCi++");
set_default_size(600, 400);
add(window_box_);
@ -83,6 +85,7 @@ Window::Window() :
window_box_.pack_start(notebook_.view());
window_box_.pack_end(terminal_.view(),Gtk::PACK_SHRINK);
show_all_children();
INFO("Window created");
} // Window constructor
void Window::OnWindowHide() {

Loading…
Cancel
Save