moritz/ptouch-prnt
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Projects Releases Wiki Activity

Add file logger and fix log level output
Some checks failed
Build ptprnt / build (push) Failing after 38s
Details

Browse Source
This commit is contained in:
Moritz Martinius
2023-11-19 14:09:53 +01:00
parent cd15930e1d
commit dd496a325b
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/PtouchPrint.cpp
View File

@@ -16,14 +16,25 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
#define SPDLOG_DEBUG_ON
#define SPDLOG_TRACE_ON
#include "PtouchPrint.hpp"
#include <CLI/App.hpp>
#include <fmt/core.h>
#include <spdlog/common.h>
#include <spdlog/details/synchronous_factory.h>
#include <spdlog/logger.h>
#include <spdlog/sinks/base_sink.h>
#include <spdlog/sinks/basic_file_sink.h>
#include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/spdlog.h>
#include <functional>
#include <memory>
#include <vector>
#include "CLI/Option.hpp"
#include "P700Printer.hpp"
@@ -45,9 +56,9 @@ int PtouchPrint::init(int argc, char** argv) {
}
if (mVerboseFlag) {
setupLogger(spdlog::level::trace);
setupLogger(spdlog::level::debug);
} else {
setupLogger(spdlog::level::critical);
setupLogger(spdlog::level::err);
}
if (!mUsbDeviceFactory.init()) {
@@ -59,10 +70,12 @@ int PtouchPrint::init(int argc, char** argv) {
}
int PtouchPrint::run() {
spdlog::debug("ptprnt version {}", mVersionString);
SPDLOG_TRACE("testing trace");
auto numFoundPrinters = getCompatiblePrinters();
if (numFoundPrinters == 0) {
spdlog::error(
"No compatible printers found, please make sure if they are turned on and connected");
"No compatible printers found, please make sure that they are turned on and connected");
return -1;
} else if (numFoundPrinters > 1) {
spdlog::warn("Found more than one compatible printer. Currently not supported.");
@@ -84,7 +97,7 @@ int PtouchPrint::run() {
//printer->printText("wurst", 1);
for (auto& cmd : mCommands) {
std::cout << cmd.second << std::endl;
spdlog::debug("Command: {}", cmd.second);
}
return 0;
@@ -113,13 +126,22 @@ unsigned int PtouchPrint::getCompatiblePrinters() {
}
void PtouchPrint::setupLogger(spdlog::level::level_enum lvl) {
spdlog::set_level(lvl);
spdlog::debug("Starting ptprnt {}", mVersionString);
auto consoleSink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
consoleSink->set_level(lvl);
consoleSink->set_pattern("%^%L:%$ %v");
auto fileSink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("ptprnt.log", true);
fileSink->set_level(spdlog::level::trace);
fileSink->set_pattern("%Y-%m-%d %H:%m:%S:%e [pid:%P tid:%t] [%^%l%$] %v (%@)");
std::vector<spdlog::sink_ptr> sinks{consoleSink, fileSink};
auto logger = std::make_shared<spdlog::logger>("default_logger", sinks.begin(), sinks.end());
logger->set_level(spdlog::level::trace);
spdlog::set_default_logger(logger);
}
void PtouchPrint::setupCliParser() {
auto printVersion = [this](std::size_t) {
std::cout << "ptprnt version: " << mVersionString << std::endl;
fmt::println("ptprnt version: {}", mVersionString);
};
// General options