diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-07-04 10:25:54 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-07-04 12:34:11 +0200 |
commit | cd68e9fae6097a7938d5ca127b43942a20f2235f (patch) | |
tree | 8a127bb97beb55a9f44d348febdb49abc1c5eb21 /libnitrokey-v3.4.1/log.cc | |
parent | fe86df47853718983e1f45d6a4289a1d93ace45c (diff) | |
download | nitrokey-sys-rs-cd68e9fae6097a7938d5ca127b43942a20f2235f.tar.gz nitrokey-sys-rs-cd68e9fae6097a7938d5ca127b43942a20f2235f.tar.bz2 |
Update to libnitrokey v3.5
This patch updates libnitrokey from version 3.4.1 to version 3.5 and
lists all API changes in the changelog.
Diffstat (limited to 'libnitrokey-v3.4.1/log.cc')
-rw-r--r-- | libnitrokey-v3.4.1/log.cc | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/libnitrokey-v3.4.1/log.cc b/libnitrokey-v3.4.1/log.cc deleted file mode 100644 index 06acee7..0000000 --- a/libnitrokey-v3.4.1/log.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2015-2018 Nitrokey UG - * - * This file is part of libnitrokey. - * - * libnitrokey is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * libnitrokey is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with libnitrokey. If not, see <http://www.gnu.org/licenses/>. - * - * SPDX-License-Identifier: LGPL-3.0 - */ - -#include "log.h" -#include <iostream> -#include <ctime> -#include <iomanip> - -#include <sstream> - -namespace nitrokey { - namespace log { - - Log *Log::mp_instance = nullptr; - StdlogHandler stdlog_handler; - - std::string Log::prefix = ""; - - - std::string LogHandler::loglevel_to_str(Loglevel lvl) { - switch (lvl) { - case Loglevel::DEBUG_L1: - return std::string("DEBUG_L1"); - case Loglevel::DEBUG_L2: - return std::string("DEBUG_L2"); - case Loglevel::DEBUG: - return std::string("DEBUG"); - case Loglevel::INFO: - return std::string("INFO"); - case Loglevel::WARNING: - return std::string("WARNING"); - case Loglevel::ERROR: - return std::string("ERROR"); - } - return std::string(""); - } - - void Log::operator()(const std::string &logstr, Loglevel lvl) { - if (mp_loghandler != nullptr){ - if ((int) lvl <= (int) m_loglevel) mp_loghandler->print(prefix+logstr, lvl); - } - } - - void Log::setPrefix(const std::string prefix) { - if (!prefix.empty()){ - Log::prefix = "["+prefix+"]"; - } else { - Log::prefix = ""; - } - } - - void StdlogHandler::print(const std::string &str, Loglevel lvl) { - std::string s = format_message_to_string(str, lvl); - std::clog << s; - } - - void FunctionalLogHandler::print(const std::string &str, Loglevel lvl) { - std::string s = format_message_to_string(str, lvl); - log_function(s); - } - - std::string LogHandler::format_message_to_string(const std::string &str, const Loglevel &lvl) { - static bool last_short = false; - if (str.length() == 1){ - last_short = true; - return str; - } - time_t t = time(nullptr); - tm tm = *localtime(&t); - - std::stringstream s; - s - << (last_short? "\n" : "") - << "[" << std::put_time(&tm, "%c") << "]" - << "[" << loglevel_to_str(lvl) << "]\t" - << str << std::endl; - last_short = false; - return s.str(); - } - - FunctionalLogHandler::FunctionalLogHandler(log_function_type _log_function) { - log_function = _log_function; - } - } -} |