From a561e6b428d1ba7aa47827baf0f0cdc697b5ebf0 Mon Sep 17 00:00:00 2001 From: Nam Tran Date: Tue, 24 Nov 2020 18:36:58 -0600 Subject: [PATCH] set up log files --- channel.cc | 4 ++-- client.cc | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/channel.cc b/channel.cc index 91daa07..c2733cb 100644 --- a/channel.cc +++ b/channel.cc @@ -25,10 +25,10 @@ Channel::Channel(char const * ptr, size_t len) { void Channel::Print(){ if (valid) { - spdlog::info("channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", + spdlog::get("zynqDump")->info("channel {}, spill {}, size {}, blocks {}, crossing {}, integrals {}, {}, {}", id, spill, size, block_count, crossing, integral[0], integral[1], integral[2]); } else { - spdlog::info("Invalid channel"); + spdlog::get("zynqDump")->info("Invalid channel"); } } diff --git a/client.cc b/client.cc index fb97596..bbd763b 100644 --- a/client.cc +++ b/client.cc @@ -15,6 +15,7 @@ #include #include "channel.h" #include "spdlog/spdlog.h" +#include "spdlog/sinks/rotating_file_sink.h" const char * HOST = "192.168.30.89"; const uint32_t PORT = 9999; @@ -123,7 +124,7 @@ int main(int argc, char * argv[]) else{ // read in first 4 bytes nread = recv(sock, char_buffer, 4, 0); - spdlog::info("read in {:d} bytes: 0x{:X}", nread, wordData[0]); + spdlog::get("zynqDump")->debug("read in {:d} bytes: 0x{:X}", nread, wordData[0]); // if not A5 marker, go to next iteration (read in 4 more bytes) if ((char_buffer[0] & 0xFF) != 0xA5){ bad_data = true; @@ -140,14 +141,14 @@ int main(int argc, char * argv[]) } else { // ok, this seems to be good data - spdlog::info("next {:d} bytes (expecting {:d}): {:X} {:X} {:X} {:X}", + spdlog::get("zynqDump")->debug("next {:d} bytes (expecting {:d}): {:X} {:X} {:X} {:X}", nread, frameSize - 4, wordData[0], wordData[1], wordData[2], wordData[3]); - spdlog::info("{:X} {:X} {:X} {:X}", wordData[4], wordData[5], wordData[6], wordData[7]); + spdlog::get("zynqDump")->debug("{:X} {:X} {:X} {:X}", wordData[4], wordData[5], wordData[6], wordData[7]); uint8_t board_id = (wordData[0] >> 24) & 0xFF; uint8_t version = wordData[0] & 0xFF; uint16_t spill_id = (wordData[1] & 0x00FFFF00) >> 8; uint8_t channel_count = (wordData[1]) & 0x000000FF; - spdlog::info("board {}, version {}, spill {}, channel_count {}", + spdlog::get("zynqDump")->info("board {}, version {}, spill {}, channel_count {}", static_cast(board_id), static_cast(version), static_cast(spill_id), @@ -164,7 +165,7 @@ int main(int argc, char * argv[]) bytes_processed += process_channel(char_buffer + 2 * sizeof(uint32_t) + bytes_processed, bytes_left - bytes_processed); } - spdlog::info("Done, {} bytes processed.", bytes_processed); + spdlog::get("zynqDump")->debug("Done, {} bytes processed.", bytes_processed); } } @@ -177,7 +178,7 @@ int main(int argc, char * argv[]) } void signalHandler( int signum ) { - spdlog::info("Interrupt signal ({}) received, exiting...", signum); + spdlog::get("zynqDump")->info("Interrupt signal ({}) received, exiting...", signum); running = false; } @@ -206,4 +207,13 @@ int open_socket(){ } void setup_logger(){ + try { + auto max_size = 1048576 * 5; + auto max_files = 3; + auto logger = spdlog::rotating_logger_mt("zynqDump", "logs/dump.txt", max_size, max_files); + } + catch (const spdlog::spdlog_ex &ex) { + std::cerr << "Log init failed: " << ex.what() << std::endl; + exit(-1); + } }