From acf7840edf430d36ec01ad7ddbe98a7e490ba215 Mon Sep 17 00:00:00 2001 From: haller Date: Sun, 7 May 2006 22:22:25 +0000 Subject: * Modification du Mafefile.defs de log * Integration du LogServer dans la factory --- i/marvin/src/log/Makefile.defs | 5 +++-- i/marvin/src/log/data_circular_buffer_factory.cc | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'i') diff --git a/i/marvin/src/log/Makefile.defs b/i/marvin/src/log/Makefile.defs index 1325874..43aaed4 100644 --- a/i/marvin/src/log/Makefile.defs +++ b/i/marvin/src/log/Makefile.defs @@ -1,11 +1,12 @@ PROGRAMS += test_log test_log_server +log_server_OBJECTS = log_server.o $(socket_databuffer_OBJECTS) + log_OBJECTS = log.o log_message.o logger.o \ logger_stdout.o logger_file.o logger_ram.o \ data_circular_buffer_factory.o \ + $(log_server_OBJECTS) \ $(config_OBJECTS) $(data_OBJECTS) -log_server_OBJECTS = log_server.o $(socket_databuffer_OBJECTS) - test_log_OBJECTS = test_log.o $(log_OBJECTS) test_log_server_OBJECTS = test_log_server.o $(log_server_OBJECTS) $(data_OBJECTS) diff --git a/i/marvin/src/log/data_circular_buffer_factory.cc b/i/marvin/src/log/data_circular_buffer_factory.cc index 231f57b..a45d3bc 100644 --- a/i/marvin/src/log/data_circular_buffer_factory.cc +++ b/i/marvin/src/log/data_circular_buffer_factory.cc @@ -23,6 +23,9 @@ // // }}} #include "data_circular_buffer_factory.hh" +#include "log_server.hh" + +#include /// Initialisation of static member. DataCircularBuffer *DataCircularBufferFactory::dbBuffer_ = 0; @@ -41,6 +44,14 @@ DataCircularBufferFactory::~DataCircularBufferFactory (void) if (!refCount_ && dbBuffer_) { // XXX Create a server in a try/catch block for removing exception. + try + { + LogServer(*dbBuffer_, "", 2442); + } + catch(std::exception & ex) + { + std::cout << ex.what() << std::endl; + } // uint8_t c; // while (dbBuffer_-> read (&c, 1)) // std::cout << c; -- cgit v1.2.3