[Box Backup-commit] COMMIT r2317 - in box/trunk: infrastructure lib/server
boxbackup-dev at boxbackup.org
boxbackup-dev at boxbackup.org
Fri Oct 3 23:46:16 BST 2008
Author: chris
Date: 2008-10-03 23:46:16 +0100 (Fri, 03 Oct 2008)
New Revision: 2317
Modified:
box/trunk/infrastructure/buildenv-testmain-template.cpp
box/trunk/lib/server/Daemon.cpp
Log:
Remove -K option which now does nothing on Windows.
Add -Q option which disables all logging instead.
Modified: box/trunk/infrastructure/buildenv-testmain-template.cpp
===================================================================
--- box/trunk/infrastructure/buildenv-testmain-template.cpp 2008-10-03 22:45:11 UTC (rev 2316)
+++ box/trunk/infrastructure/buildenv-testmain-template.cpp 2008-10-03 22:46:16 UTC (rev 2317)
@@ -54,7 +54,7 @@
std::string first_fail_file;
#ifdef WIN32
- #define QUIET_PROCESS "-K"
+ #define QUIET_PROCESS "-Q"
#else
#define QUIET_PROCESS ""
#endif
Modified: box/trunk/lib/server/Daemon.cpp
===================================================================
--- box/trunk/lib/server/Daemon.cpp 2008-10-03 22:45:11 UTC (rev 2316)
+++ box/trunk/lib/server/Daemon.cpp 2008-10-03 22:46:16 UTC (rev 2317)
@@ -95,9 +95,9 @@
{
return "c:"
#ifndef WIN32
- "DF"
+ "DFK"
#endif
- "hkKPqt:TUvVW:";
+ "hkPqQt:TUvVW:";
}
void Daemon::Usage()
@@ -116,13 +116,14 @@
" -F Do not fork into background, but fork to serve multiple clients\n"
#endif
" -k Keep console open after fork, keep writing log messages to it\n"
+#ifndef WIN32
" -K Stop writing log messages to console while daemon is running\n"
-#ifndef WIN32
" -P Show process ID (PID) in console output\n"
#endif
" -q Run more quietly, reduce verbosity level by one, can repeat\n"
+ " -Q Run at minimum verbosity, log nothing\n"
" -v Run more verbosely, increase verbosity level by one, can repeat\n"
- " -V Run at maximum verbosity\n"
+ " -V Run at maximum verbosity, log everything\n"
" -W <level> Set verbosity to error/warning/notice/info/trace/everything\n"
" -t <tag> Tag console output with specified marker\n"
" -T Timestamp console output\n"
@@ -203,6 +204,13 @@
}
break;
+ case 'Q':
+ {
+ mLogLevel = Log::NOTHING;
+ }
+ break;
+
+
case 'v':
{
if(mLogLevel == Log::EVERYTHING)
@@ -621,7 +629,7 @@
TRACE_TO_STDOUT(false);
#endif // ! WIN32
Logging::ToConsole(false);
- }
+ }
// Log the start message
BOX_NOTICE("Starting daemon, version: " << BOX_VERSION);
More information about the Boxbackup-commit
mailing list