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.

Sign up for GitHub

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

Jump to bottom

Plog debug wrapper #77

Merged
merged 9 commits into from
Feb 15, 2023
Merged

Plog debug wrapper #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4b976f
basic debug macro
forwardpointer Feb 9, 2023
bc3bc3e
add debug wrapper to all the windows main.cxx files
forwardpointer Feb 9, 2023
038c3aa
Merge branch 'develop' into plog_debug
forwardpointer Feb 14, 2023
5facf13
unconditionally add the debug appender
forwardpointer Feb 14, 2023
a833184
Merge pull request #72 from microsoft/plog_debug
forwardpointer Feb 14, 2023
213b735
remove unnecessary wrapper
forwardpointer Feb 14, 2023
be54f4b
formatting
forwardpointer Feb 14, 2023
285d914
Merge branch 'develop' into plog_etw
forwardpointer Feb 14, 2023
9cfb09e
logutils is not used by logging-plog-windows
forwardpointer Feb 15, 2023
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: 3 additions & 1 deletion windows/nearobjectsvc/Main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <nearobject/service/ServiceRuntime.hxx>
#include <windows/nearobject/service/NearObjectDeviceDiscoveryAgentUwb.hxx>

#include <plog/Appenders/DebugOutputAppender.h>
#include <plog/Formatters/TxtFormatter.h>
#include <plog/Init.h>
#include <plog/Log.h>
Expand Down Expand Up @@ -53,7 +54,8 @@ int
main(int argc, char *argv[])
{
logging::plog::TraceLoggingAppender<plog::TxtFormatter> traceLoggingAppender(NearObjectSvcTraceLoggingProvider);
plog::init(plog::debug, &traceLoggingAppender);
plog::DebugOutputAppender<plog::TxtFormatter> debugAppender;
plog::init(plog::debug, &traceLoggingAppender).addAppender(&debugAppender);

// Resolve user home directory.
const std::filesystem::path homePath{ GetUserHomePath() };
Expand Down
9 changes: 7 additions & 2 deletions windows/tools/devicemon/Main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,20 @@
#include <windows/devices/DeviceEnumerator.hxx>
#include <windows/devices/DevicePresenceMonitor.hxx>

#include <plog/Initializers/RollingFileInitializer.h>
#include <plog/Appenders/DebugOutputAppender.h>
#include <plog/Appenders/RollingFileAppender.h>
#include <plog/Formatters/TxtFormatter.h>
#include <plog/Init.h>
#include <plog/Log.h>

#include <logging/LogUtils.hxx>

int
main(int argc, char* argv[])
{
plog::init(plog::verbose, logging::GetLogName("devicemon").c_str());
plog::RollingFileAppender<plog::TxtFormatter> rollingFileAppender(logging::GetLogName("devicemon").c_str());
plog::DebugOutputAppender<plog::TxtFormatter> debugAppender;
plog::init(plog::verbose, &rollingFileAppender).addAppender(&debugAppender);

CLI::App app{};
app.name("devicemon");
Expand Down
9 changes: 7 additions & 2 deletions windows/tools/nocli/Main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,20 @@
#include <windows/devices/DevicePresenceMonitor.hxx>
#include <windows/devices/uwb/UwbDevice.hxx>

#include <plog/Initializers/RollingFileInitializer.h>
#include <plog/Appenders/DebugOutputAppender.h>
#include <plog/Appenders/RollingFileAppender.h>
#include <plog/Formatters/TxtFormatter.h>
#include <plog/Init.h>
#include <plog/Log.h>

#include <logging/LogUtils.hxx>

int
main(int argc, char* argv[])
try {
plog::init(plog::verbose, logging::GetLogName("nocli").c_str());
plog::RollingFileAppender<plog::TxtFormatter> rollingFileAppender(logging::GetLogName("nocli").c_str());
plog::DebugOutputAppender<plog::TxtFormatter> debugAppender;
plog::init(plog::verbose, &rollingFileAppender).addAppender(&debugAppender);

auto cliData = std::make_shared<nearobject::cli::NearObjectCliDataWindows>();
auto cliHandler = std::make_shared<nearobject::cli::NearObjectCliHandlerWindows>();
Expand Down
9 changes: 7 additions & 2 deletions windows/tools/uwb/simulator/Main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
#include <windows/devices/DeviceEnumerator.hxx>
#include <windows/devices/uwb/simulator/UwbDeviceSimulator.hxx>

#include <plog/Initializers/RollingFileInitializer.h>
#include <plog/Appenders/DebugOutputAppender.h>
#include <plog/Appenders/RollingFileAppender.h>
#include <plog/Formatters/TxtFormatter.h>
#include <plog/Init.h>
#include <plog/Log.h>

#include <logging/LogUtils.hxx>
Expand All @@ -21,7 +24,9 @@ using namespace windows::devices;
int
main(int argc, char* argv[])
{
plog::init(plog::verbose, logging::GetLogName("uwbsim").c_str());
plog::RollingFileAppender<plog::TxtFormatter> rollingFileAppender(logging::GetLogName("uwbsim").c_str());
plog::DebugOutputAppender<plog::TxtFormatter> debugAppender;
plog::init(plog::verbose, &rollingFileAppender).addAppender(&debugAppender);

CLI::App app{};
app.name("uwbsim");
Expand Down