Author: herb Date: 2007-03-13 17:39:06 +0000 (Tue, 13 Mar 2007) New Revision: 21825
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21825 Log: add debug prefix timestamp to allow "short timestamps" to be added to debug messages Modified: branches/SAMBA_3_0/source/lib/debug.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0_25/source/lib/debug.c branches/SAMBA_3_0_25/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_0/source/lib/debug.c =================================================================== --- branches/SAMBA_3_0/source/lib/debug.c 2007-03-13 17:05:04 UTC (rev 21824) +++ branches/SAMBA_3_0/source/lib/debug.c 2007-03-13 17:39:06 UTC (rev 21825) @@ -962,7 +962,7 @@ /* Print the header if timestamps are turned on. If parameters are * not yet loaded, then default to timestamps on. */ - if( lp_timestamp_logs() || !(lp_loaded()) ) { + if( lp_timestamp_logs() || lp_debug_prefix_timestamp() || !(lp_loaded()) ) { char header_str[200]; header_str[0] = '\0'; @@ -980,9 +980,15 @@ } /* Print it all out at once to prevent split syslog output. */ - (void)Debug1( "[%s, %d%s] %s:%s(%d)\n", + if( lp_debug_prefix_timestamp() ) { + (void)Debug1( "[%s, %d%s] ", current_timestring(lp_debug_hires_timestamp()), level, + header_str); + } else { + (void)Debug1( "[%s, %d%s] %s:%s(%d)\n", + current_timestring(lp_debug_hires_timestamp()), level, header_str, file, func, line ); + } } errno = old_errno; Modified: branches/SAMBA_3_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0/source/param/loadparm.c 2007-03-13 17:05:04 UTC (rev 21824) +++ branches/SAMBA_3_0/source/param/loadparm.c 2007-03-13 17:39:06 UTC (rev 21825) @@ -290,6 +290,7 @@ BOOL bClientNTLMv2Auth; BOOL bClientPlaintextAuth; BOOL bClientUseSpnego; + BOOL bDebugPrefixTimestamp; BOOL bDebugHiresTimestamp; BOOL bDebugPid; BOOL bDebugUid; @@ -952,6 +953,7 @@ {"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size, NULL, NULL, FLAG_ADVANCED}, {"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_ADVANCED}, {"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_ADVANCED}, + {"debug prefix timestamp", P_BOOL, P_GLOBAL, &Globals.bDebugPrefixTimestamp, NULL, NULL, FLAG_ADVANCED}, {"debug hires timestamp", P_BOOL, P_GLOBAL, &Globals.bDebugHiresTimestamp, NULL, NULL, FLAG_ADVANCED}, {"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, FLAG_ADVANCED}, {"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, FLAG_ADVANCED}, @@ -1516,6 +1518,7 @@ Globals.bSyslogOnly = False; Globals.bTimestampLogs = True; string_set(&Globals.szLogLevel, "0"); + Globals.bDebugPrefixTimestamp = False; Globals.bDebugHiresTimestamp = False; Globals.bDebugPid = False; Globals.bDebugUid = False; @@ -1947,6 +1950,7 @@ FN_GLOBAL_INTEGER(lp_server_schannel, &Globals.serverSchannel) FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly) FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs) +FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, &Globals.bDebugPrefixTimestamp) FN_GLOBAL_BOOL(lp_debug_hires_timestamp, &Globals.bDebugHiresTimestamp) FN_GLOBAL_BOOL(lp_debug_pid, &Globals.bDebugPid) FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid) Modified: branches/SAMBA_3_0_25/source/lib/debug.c =================================================================== --- branches/SAMBA_3_0_25/source/lib/debug.c 2007-03-13 17:05:04 UTC (rev 21824) +++ branches/SAMBA_3_0_25/source/lib/debug.c 2007-03-13 17:39:06 UTC (rev 21825) @@ -962,7 +962,7 @@ /* Print the header if timestamps are turned on. If parameters are * not yet loaded, then default to timestamps on. */ - if( lp_timestamp_logs() || !(lp_loaded()) ) { + if( lp_timestamp_logs() || lp_debug_prefix_timestamp() || !(lp_loaded()) ) { char header_str[200]; header_str[0] = '\0'; @@ -980,9 +980,15 @@ } /* Print it all out at once to prevent split syslog output. */ - (void)Debug1( "[%s, %d%s] %s:%s(%d)\n", + if( lp_debug_prefix_timestamp() ) { + (void)Debug1( "[%s, %d%s] ", current_timestring(lp_debug_hires_timestamp()), level, + header_str); + } else { + (void)Debug1( "[%s, %d%s] %s:%s(%d)\n", + current_timestring(lp_debug_hires_timestamp()), level, header_str, file, func, line ); + } } errno = old_errno; Modified: branches/SAMBA_3_0_25/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0_25/source/param/loadparm.c 2007-03-13 17:05:04 UTC (rev 21824) +++ branches/SAMBA_3_0_25/source/param/loadparm.c 2007-03-13 17:39:06 UTC (rev 21825) @@ -290,6 +290,7 @@ BOOL bClientNTLMv2Auth; BOOL bClientPlaintextAuth; BOOL bClientUseSpnego; + BOOL bDebugPrefixTimestamp; BOOL bDebugHiresTimestamp; BOOL bDebugPid; BOOL bDebugUid; @@ -953,6 +954,7 @@ {"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size, NULL, NULL, FLAG_ADVANCED}, {"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_ADVANCED}, {"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_ADVANCED}, + {"debug prefix timestamp", P_BOOL, P_GLOBAL, &Globals.bDebugPrefixTimestamp, NULL, NULL, FLAG_ADVANCED}, {"debug hires timestamp", P_BOOL, P_GLOBAL, &Globals.bDebugHiresTimestamp, NULL, NULL, FLAG_ADVANCED}, {"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, FLAG_ADVANCED}, {"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, FLAG_ADVANCED}, @@ -1517,6 +1519,7 @@ Globals.bSyslogOnly = False; Globals.bTimestampLogs = True; string_set(&Globals.szLogLevel, "0"); + Globals.bDebugPrefixTimestamp = False; Globals.bDebugHiresTimestamp = False; Globals.bDebugPid = False; Globals.bDebugUid = False; @@ -1945,6 +1948,7 @@ FN_GLOBAL_INTEGER(lp_server_schannel, &Globals.serverSchannel) FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly) FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs) +FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, &Globals.bDebugPrefixTimestamp) FN_GLOBAL_BOOL(lp_debug_hires_timestamp, &Globals.bDebugHiresTimestamp) FN_GLOBAL_BOOL(lp_debug_pid, &Globals.bDebugPid) FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid)
