Skip to content

Commit

Permalink
[pre-commit.ci lite] apply automatic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci-lite[bot] authored Jan 19, 2025
1 parent 2e06a07 commit f10a1ef
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
6 changes: 3 additions & 3 deletions src/software/logger/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ cc_library(

cc_library(
name = "network_logger",
hdrs = [
"network_logger.h",
],
srcs = [
"network_logger.cpp",
],
hdrs = [
"network_logger.h",
],
deps = [
":coloured_cout_sink",
":network_sink",
Expand Down
17 changes: 9 additions & 8 deletions src/software/logger/network_logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ NetworkLoggerSingleton::NetworkLoggerSingleton(int robot_id, bool enable_log_mer
{
logWorker = g3::LogWorker::createLogWorker();

network_sink_handle = logWorker->addSink(std::make_unique<NetworkSink>(robot_id, enable_log_merging),
&NetworkSink::sendToNetwork);
network_sink_handle =
logWorker->addSink(std::make_unique<NetworkSink>(robot_id, enable_log_merging),
&NetworkSink::sendToNetwork);

// Sink for outputting logs to the terminal
auto colour_cout_sink_handle =
logWorker->addSink(std::make_unique<ColouredCoutSink>(true),
&ColouredCoutSink::displayColouredLog);
auto colour_cout_sink_handle = logWorker->addSink(
std::make_unique<ColouredCoutSink>(true), &ColouredCoutSink::displayColouredLog);

auto csv_sink_handle = logWorker->addSink(std::make_unique<CSVSink>(CSV_PATH),
&CSVSink::appendToFile);
auto csv_sink_handle =
logWorker->addSink(std::make_unique<CSVSink>(CSV_PATH), &CSVSink::appendToFile);

// Sink for PlotJuggler plotting
auto plotjuggler_handle = logWorker->addSink(std::make_unique<PlotJugglerSink>(),
Expand All @@ -35,7 +35,8 @@ void NetworkLoggerSingleton::initializeLogger(int robot_id, bool enable_log_merg
}
}

void NetworkLoggerSingleton::replaceUdpSender(std::shared_ptr<ThreadedProtoUdpSender<TbotsProto::RobotLog>> new_sender)
void NetworkLoggerSingleton::replaceUdpSender(
std::shared_ptr<ThreadedProtoUdpSender<TbotsProto::RobotLog>> new_sender)
{
if (!instance)
{
Expand Down
10 changes: 6 additions & 4 deletions src/software/network_log_listener_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

class RobotLogListenerWrapper
{
private:
std::mutex m;
std::optional<std::unique_ptr<ThreadedProtoUdpListener<TbotsProto::RobotLog>>> listener;
private:
std::mutex m;
std::optional<std::unique_ptr<ThreadedProtoUdpListener<TbotsProto::RobotLog>>>
listener;
};

std::unordered_map<RobotId, RobotLogListenerWrapper> robot_log_listeners;
Expand Down Expand Up @@ -66,7 +67,8 @@ int main(int argc, char **argv)
"Network interface to listen for robot logs from");
desc.add_options()(
"selected_ids",
boost::program_options::value<std::vector<RobotId>>(&args.selected_ids)->multitoken(),
boost::program_options::value<std::vector<RobotId>>(&args.selected_ids)
->multitoken(),
"Space separated robot IDs to show logs from. If not specified, logs from all robots will be shown");

boost::program_options::variables_map vm;
Expand Down

0 comments on commit f10a1ef

Please sign in to comment.