Remove extra inclusion of __FUNCTION__ and __LINE__, since they are already included in DEBUG() output by default.

[jelmer]

already included in DEBUG() output by default.

[blaxter]

There are lot of DEBUG() messages with __FUNCTION__ and __LINE__ despite that in default samba.log __LOCATION__ is added to every line.

Actually some of those DEBUG() are mine 😳, mostly because I normally execute samba with -i, in that mode DEBUG() messages don't have the same format than in samba (the timestamp line doesn't show up). Do you know why is there such difference behaviour?

I have to figure this out and then I'll be more than happy to unify DEBUG macros and remove all those __FOO__ stuff ✌️

[jelmer]

Ah, that makes sense. I was wondering why those macros had been added in the first place. :-)

I'll see if I can add a flag to Samba to include the location by default when writing logs to standard out in interactive mode.

[kamenim]

As far as I recall, Samba prints timestamp only when using syslog

On Mon, Dec 1, 2014 at 8:47 PM, Jelmer Vernooij notifications@github.com
wrote:

Ah, that makes sense. I was wondering why those macros had been added in
the first place. :-)

I'll see if I can add a flag to Samba to include the location by default
when writing logs to standard out in interactive mode.

—
Reply to this email directly or view it on GitHub
#143 (comment).

[jelmer]

@kamenim also when it directly writes to logfiles, but not when it writes to standard out.

[blaxter]

https://git.samba.org/?p=samba.git;a=blob;f=lib/util/debug.c;h=750ad2597593714dacead736558ee9e4903bb91c;hb=HEAD#l972

972         /* Don't print a header if we're logging to stdout. */
973         if ( state.logtype != DEBUG_FILE ) {
974                 return( true );
975         }
976 

[jelmer]

On Tue, Dec 02, 2014 at 02:12:42AM -0800, Jesús García Sáez wrote:

https://git.samba.org/?p=samba.git;a=blob;f=lib/util/debug.c;h=750ad2597593714dacead736558ee9e4903bb91c;hb=HEAD#l972

972         /* Don't print a header if we're logging to stdout. */
973         if ( state.logtype != DEBUG_FILE ) {
974                 return( true );
975         }
976 

Yeah. I'd like to change that to still not output the full header
(as that is kindof spammy), but perhaps prefix it with the location
information.

Cheers,

jelmer

Jelmer Vernooij jelmer@openchange.org - https://jelmer.uk/

[jkerihuel]

What is the status of this pull request now that we have OC_DEBUG implemented?

[jelmer]

Once we migrate all instances of DEBUG over, this pull request will be obsolete.

On 24 March 2015 9:56:27 am GMT+00:00, Julien Kerihuel notifications@github.com wrote:

What is the status of this pull request now that we have OC_DEBUG
implemented?

---

Reply to this email directly or view it on GitHub:
#143 (comment)

Sent from my Android device with K-9 Mail. Please excuse my brevity.

[blaxter]

so let's close this