Commit 3a1ab788 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Merged trac4310 (LOG_FATAL() double errors)

parents 1789a8c1 f693bc43
// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -175,8 +175,12 @@ main(int argc, char* argv[]) {
// Let's also try to log it using logging system, but we're not
// sure if it's usable (the exception may have been thrown from
// the logger subsystem)
LOG_FATAL(dhcp4_logger, DHCP4_ALREADY_RUNNING)
.arg(DHCP4_NAME).arg(ex.what());
try {
LOG_FATAL(dhcp4_logger, DHCP4_ALREADY_RUNNING)
.arg(DHCP4_NAME).arg(ex.what());
} catch (...) {
// Already logged so ignore
}
ret = EXIT_FAILURE;
} catch (const std::exception& ex) {
// First, we print the error on stderr (that should always work)
......@@ -186,7 +190,11 @@ main(int argc, char* argv[]) {
// Let's also try to log it using logging system, but we're not
// sure if it's usable (the exception may have been thrown from
// the logger subsystem)
LOG_FATAL(dhcp4_logger, DHCP4_SERVER_FAILED).arg(ex.what());
try {
LOG_FATAL(dhcp4_logger, DHCP4_SERVER_FAILED).arg(ex.what());
} catch (...) {
// Already logged so ignore
}
ret = EXIT_FAILURE;
}
......
// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -182,8 +182,12 @@ main(int argc, char* argv[]) {
// Let's also try to log it using logging system, but we're not
// sure if it's usable (the exception may have been thrown from
// the logger subsystem)
LOG_FATAL(dhcp6_logger, DHCP6_ALREADY_RUNNING)
.arg(DHCP6_NAME).arg(ex.what());
try {
LOG_FATAL(dhcp6_logger, DHCP6_ALREADY_RUNNING)
.arg(DHCP6_NAME).arg(ex.what());
} catch (...) {
// Already logged so ignore
}
ret = EXIT_FAILURE;
} catch (const std::exception& ex) {
......@@ -194,7 +198,11 @@ main(int argc, char* argv[]) {
// Let's also try to log it using logging system, but we're not
// sure if it's usable (the exception may have been thrown from
// the logger subsystem)
LOG_FATAL(dhcp6_logger, DHCP6_SERVER_FAILED).arg(ex.what());
try {
LOG_FATAL(dhcp6_logger, DHCP6_SERVER_FAILED).arg(ex.what());
} catch (...) {
// Already logged so ignore
}
ret = EXIT_FAILURE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment