Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ignLogInit failing if run after console output #332

Merged
merged 1 commit into from
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Console.cc
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Logger::~Logger()
/////////////////////////////////////////////////
Logger &Logger::operator()()
{
Console::log << "(" << ignition::common::systemTimeIso() << ") ";
Console::log() << "(" << ignition::common::systemTimeIso() << ") ";
(*this) << Console::Prefix() << this->prefix;

return (*this);
Expand All @@ -97,7 +97,7 @@ Logger &Logger::operator()(const std::string &_file, int _line)
{
int index = _file.find_last_of("/") + 1;

Console::log << "(" << ignition::common::systemTimeIso() << ") ";
Console::log() << "(" << ignition::common::systemTimeIso() << ") ";
std::stringstream prefixString;
prefixString << Console::Prefix() << this->prefix
<< "[" << _file.substr(index , _file.size() - index) << ":"
Expand Down
48 changes: 48 additions & 0 deletions test/integration/console.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright (C) 2022 Open Source Robotics Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

#include <gtest/gtest.h>

#include "ignition/common/Console.hh"
#include "test_config.h"

using namespace ignition;

TEST(Console_TEST, LogInitAfterConsoleOut)
{
std::string logFilename = "uri.log";
std::string logDir = common::joinPaths(PROJECT_BINARY_PATH, "test", "uri");
std::string logFile = common::joinPaths(logDir, logFilename);

common::Console::SetVerbosity(4);

// We are not logging to a file yet.
ignerr << "This is an error" << std::endl;

// Initialize the log file.
ignLogInit(logDir, logFilename);

// Run the same console output, which should output the message to the log
// file.
ignerr << "This is an error" << std::endl;
std::ifstream t(logFile);
std::string buffer((std::istreambuf_iterator<char>(t)),
std::istreambuf_iterator<char>());

EXPECT_TRUE(buffer.find("This is an error") != std::string::npos)
<< "Log file content[" << buffer << "]\n";
}