Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
3552f7d2
Commit
3552f7d2
authored
Jan 18, 2011
by
Scott Mann
Browse files
Merge remote branch 'origin/trac432'
parents
73ad1106
88022047
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/bin/bind10/bind10.8
View file @
3552f7d2
'\" t
.\" Title: bind10
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.7
6.0
<http://docbook.sf.net/>
.\" Generator: DocBook XSL Stylesheets v1.7
5.2
<http://docbook.sf.net/>
.\" Date: July 29, 2010
.\" Manual: BIND10
.\" Source: BIND10
...
...
@@ -9,15 +9,6 @@
.\"
.TH "BIND10" "8" "July 29, 2010" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
...
...
src/bin/resolver/main.cc
View file @
3552f7d2
...
...
@@ -169,7 +169,7 @@ main(int argc, char* argv[]) {
dlog
(
"Server started."
);
io_service
.
run
();
}
catch
(
const
std
::
exception
&
ex
)
{
dlog
(
string
(
"Server failed: "
)
+
ex
.
what
());
dlog
(
string
(
"Server failed: "
)
+
ex
.
what
()
,
true
);
ret
=
1
;
}
...
...
src/bin/resolver/resolver.cc
View file @
3552f7d2
...
...
@@ -93,7 +93,7 @@ public:
if
(
dnss
)
{
if
(
upstream_
.
empty
())
{
dlog
(
"Asked to do full recursive, but not implemented yet. "
"I'll do nothing."
);
"I'll do nothing."
,
true
);
}
else
{
dlog
(
"Setting forward addresses:"
);
BOOST_FOREACH
(
const
addr_t
&
address
,
upstream
)
{
...
...
@@ -323,7 +323,7 @@ Resolver::~Resolver() {
delete
checkin_
;
delete
dns_lookup_
;
delete
dns_answer_
;
dlog
(
"Deleting the Resolver"
);
dlog
(
"Deleting the Resolver"
,
true
);
}
void
...
...
@@ -361,7 +361,7 @@ Resolver::processMessage(const IOMessage& io_message, MessagePtr message,
return
;
}
}
catch
(
const
Exception
&
ex
)
{
dlog
(
string
(
"DNS packet exception: "
)
+
ex
.
what
());
dlog
(
string
(
"DNS packet exception: "
)
+
ex
.
what
()
,
true
);
server
->
resume
(
false
);
return
;
}
...
...
@@ -526,7 +526,7 @@ Resolver::updateConfig(ConstElementPtr config) {
}
return
(
isc
::
config
::
createAnswer
());
}
catch
(
const
isc
::
Exception
&
error
)
{
dlog
(
string
(
"error in config: "
)
+
error
.
what
());
dlog
(
string
(
"error in config: "
)
+
error
.
what
()
,
true
);
return
(
isc
::
config
::
createAnswer
(
1
,
error
.
what
()));
}
}
...
...
@@ -578,13 +578,13 @@ Resolver::setListenAddresses(const vector<addr_t>& addresses) {
* If that fails, bad luck, but we are useless anyway, so just die
* and let boss start us again.
*/
dlog
(
string
(
"Unable to set new address: "
)
+
e
.
what
());
dlog
(
string
(
"Unable to set new address: "
)
+
e
.
what
()
,
true
);
try
{
setAddresses
(
dnss_
,
impl_
->
listen_
);
}
catch
(
const
exception
&
e2
)
{
dlog
(
string
(
"Unable to recover from error;"
));
dlog
(
string
(
"Rollback failed with: "
)
+
e2
.
what
());
dlog
(
string
(
"Unable to recover from error;"
)
,
true
);
dlog
(
string
(
"Rollback failed with: "
)
+
e2
.
what
()
,
true
);
abort
();
}
throw
e
;
// Let it fly a little bit further
...
...
src/lib/log/dummylog.cc
View file @
3552f7d2
...
...
@@ -24,8 +24,8 @@ namespace log {
bool
denabled
=
false
;
string
dprefix
;
void
dlog
(
const
string
&
message
)
{
if
(
denabled
)
{
void
dlog
(
const
string
&
message
,
bool
error_flag
)
{
if
(
denabled
||
error_flag
)
{
if
(
!
dprefix
.
empty
())
{
cerr
<<
"["
<<
dprefix
<<
"] "
;
}
...
...
src/lib/log/dummylog.h
View file @
3552f7d2
...
...
@@ -52,7 +52,7 @@ extern std::string dprefix;
* @param message The message to log. The real interface will probably have
* more parameters.
*/
void
dlog
(
const
std
::
string
&
message
);
void
dlog
(
const
std
::
string
&
message
,
bool
error_flag
=
false
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment