-
Notifications
You must be signed in to change notification settings - Fork 905
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.
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
Remove theLog
and theL
and replace this with a global g_log
#6358
Conversation
❤️ ... but: I'd suggest:
That also gets rid of the |
L
to theLog
theLog
and theL
and replace this with a static s_log
d4157d8
to
1349a51
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, a couple remarks.
pdns/recursor_cache.hh
Outdated
@@ -30,7 +30,7 @@ | |||
#include <iostream> | |||
#include "dnsrecords.hh" | |||
#include <boost/utility.hpp> | |||
#undef L | |||
#undef s_log |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure all the #undef s_log
can go since s_log
is unlikely to collide with boost::multi_index
in the same way L
did.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes, I caught some of them already, I'll search some some.
pdns/logger.hh
Outdated
@@ -116,7 +116,7 @@ private: | |||
static pthread_key_t s_loggerKey; | |||
}; | |||
|
|||
extern Logger &theL(const string &pname=""); | |||
extern Logger s_log; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, hum, why s_log
? This variable is not static so perhaps g_log
would make more sense?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, indeed... This is me sucking at C++ because the static
keyword gave all kinds of issues.. I'll se eif I can fit it with a fresh brain
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right, i incorrectly suggested s_..., sorry!
e715532
to
481227b
Compare
rebased to fix conflists, we should get this merged soon :) |
|
probably introduced by the rebase |
Ugh, I did search for |
b30572d
to
14cdea4
Compare
theLog
and theL
and replace this with a static s_logtheLog
and theL
and replace this with a global g_log
Auth test failure looks unrelated. Merge sooner than later? :) |
rebased one more time, let's hope travis'll be green :) |
The zeromq backend module is still broken in the |
@ahkok you have replied to a merged pull request; like on a closed ticket, these comments often go unnoticed and will definitely be forgotten. Please report your problem as a comment on a relevant open ticket, or file a new ticket. |
Short description
Should close #6357 and should prevent issues in the future.
Checklist
I have: