Changeset 986240

Timestamp:

12/28/11 15:35:18 (17 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

05c0ac7f0512c87789a6d17ef38fe63e800a2085

Parents:

50e69a476cde16d6a76f84133667182ecc4de8e3

git-author:

Micke Prag <micke.prag@telldus.se>2011-12-28 15:23:59+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2011-12-28 15:35:18+01:00

Message:

Add command line argument to debug output

Location:

telldus-core/service

Files:

• Log.cpp (modified) (3 diffs)
• Log.h (modified) (1 diff)
• TelldusWinService_win.cpp (modified) (1 diff)

telldus-core/service/Log.cpp

@@ -12 +12 @@
 class Log::PrivateData {
 public:
-        PrivateData() : logOutput(Log::System) {}
+        PrivateData() : logOutput(Log::System), debug(false) {}
 
         Log::LogOutput logOutput;
+        bool debug;
 
         static Log *instance;
@@ -105 +106 @@
 }
 
+void Log::setDebug() {
+        Log *log = Log::instance();
+        log->d->debug = true;
+}
+
 void Log::setLogOutput(LogOutput logOutput) {
         Log *log = Log::instance();
@@ -111 +117 @@
 
 void Log::message(Log::LogLevel logLevel, const char *format, va_list ap) const {
+        if (logLevel == Debug && d->debug == false) {
+                return;
+        }
         if (d->logOutput == StdOut) {
                 FILE *stream = stdout;

telldus-core/service/Log.h

@@ -17 +17 @@
         static void error(const char *fmt, ...);
 
+        static void setDebug();
         static void setLogOutput(LogOutput logOutput);
 

telldus-core/service/TelldusWinService_win.cpp

@@ -113 +113 @@
         TelldusWinService instance;
 
+        //Enable debug if we hade this supplied
+        for(unsigned int i = 1; i < argc; ++i) {
+                if (wcscmp(argv[i], L"--debug") == 0) {
+                        Log::setDebug();
+                }
+        }
+
         // initialise service status
         instance.serviceStatus.dwServiceType = SERVICE_WIN32;