From c2f9cc6051e586d4422f74c97df09ef4e86211a5 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 23 May 2024 13:46:46 +0300 Subject: [PATCH] [#2960] removed useless try catch --- doc/sphinx/arm/hooks-ha.rst | 4 ++-- src/bin/dhcp4/ctrl_dhcp4_srv.cc | 21 ++++++--------------- src/bin/dhcp6/ctrl_dhcp6_srv.cc | 21 ++++++--------------- 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst index 154d688413..c39ab35d3a 100644 --- a/doc/sphinx/arm/hooks-ha.rst +++ b/doc/sphinx/arm/hooks-ha.rst @@ -1929,7 +1929,7 @@ learn which scopes are available for the different HA modes of operation. The :isccmd:`ha-scopes` command can put Kea servers into conflicting states, which can lead to unexpected behavior. Changing scopes does not automatically change the state of the server or its relationship with a partner. - + For example, when we add primary scopes to the standby server it will start responding to DHCP traffic for those scopes. This can lead to a situation where both servers are responding to the same traffic, which can lead to IP address @@ -2628,4 +2628,4 @@ branch ``server3``: and ``reselect-subnet-pool`` parameters of the :ischooklib:`libdhcp_radius.so`. The High Availability hook library uses an originally selected subnet for choosing an HA relationship to process a packet. The subnet reselection may interfere with this choice. See the - :ref:`radius-config` for details. \ No newline at end of file + :ref:`radius-config` for details. diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index fb3565efa2..d0483a3584 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -75,14 +75,11 @@ CtrlDhcp4Hooks Hooks; /// /// @param signo Signal number received. void signalHandler(int signo) { - try { - // SIGHUP signals a request to reconfigure the server. - if (signo == SIGHUP) { - CommandMgr::instance().processCommand(createCommand("config-reload")); - } else if ((signo == SIGTERM) || (signo == SIGINT)) { - CommandMgr::instance().processCommand(createCommand("shutdown")); - } - } catch (const isc::Exception& ex) { + // SIGHUP signals a request to reconfigure the server. + if (signo == SIGHUP) { + CommandMgr::instance().processCommand(createCommand("config-reload")); + } else if ((signo == SIGTERM) || (signo == SIGINT)) { + CommandMgr::instance().processCommand(createCommand("shutdown")); } } @@ -159,13 +156,7 @@ ControlledDhcpv4Srv::loadConfigFile(const std::string& file_name) { } // Use parsed JSON structures to configure the server - try { - result = CommandMgr::instance().processCommand(createCommand("config-set", json)); - } catch (const isc::Exception& ex) { - result = isc::config::createAnswer(CONTROL_RESULT_ERROR, string("Error while processing command " - "'config-set': ") + ex.what() + - ", params: '" + json->str() + "'"); - } + result = CommandMgr::instance().processCommand(createCommand("config-set", json)); if (!result) { // Undetermined status of the configuration. This should never // happen, but as the configureDhcp4Server returns a pointer, it is diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index 6f7ef12056..457eeb46a1 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -78,14 +78,11 @@ static const char* SERVER_DUID_FILE = "kea-dhcp6-serverid"; /// /// @param signo Signal number received. void signalHandler(int signo) { - try { - // SIGHUP signals a request to reconfigure the server. - if (signo == SIGHUP) { - CommandMgr::instance().processCommand(createCommand("config-reload")); - } else if ((signo == SIGTERM) || (signo == SIGINT)) { - CommandMgr::instance().processCommand(createCommand("shutdown")); - } - } catch (const isc::Exception& ex) { + // SIGHUP signals a request to reconfigure the server. + if (signo == SIGHUP) { + CommandMgr::instance().processCommand(createCommand("config-reload")); + } else if ((signo == SIGTERM) || (signo == SIGINT)) { + CommandMgr::instance().processCommand(createCommand("shutdown")); } } @@ -162,13 +159,7 @@ ControlledDhcpv6Srv::loadConfigFile(const std::string& file_name) { } // Use parsed JSON structures to configure the server - try { - result = CommandMgr::instance().processCommand(createCommand("config-set", json)); - } catch (const isc::Exception& ex) { - result = isc::config::createAnswer(CONTROL_RESULT_ERROR, string("Error while processing command " - "'config-set': ") + ex.what() + - ", params: '" + json->str() + "'"); - } + result = CommandMgr::instance().processCommand(createCommand("config-set", json)); if (!result) { // Undetermined status of the configuration. This should never // happen, but as the configureDhcp6Server returns a pointer, it is -- 2.47.2