mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[2439] (unrelated) Remove broken try-catch for import

Browse Source 
If we can't even import the DNS library, we are doomed and there's no
reason to continue running. So remove the check. We would probably crash
in a very short time anyway due to a call to something from the not
imported library.
This commit is contained in:
Michal 'vorner' Vaner
2013-01-22 13:35:41 +01:00
parent e382b73b40
commit 0d69610fff
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/xfrin/xfrin.py.in
View File

@@ -36,6 +36,7 @@ from isc.xfrin.diff import Diff
from isc.server_common.auth_command import auth_loadzone_command from isc.server_common.auth_command import auth_loadzone_command
from isc.server_common.tsig_keyring import init_keyring, get_keyring from isc.server_common.tsig_keyring import init_keyring, get_keyring
from isc.log_messages.xfrin_messages import * from isc.log_messages.xfrin_messages import *
from isc.dns import *
isc.log.init("b10-xfrin", buffer=True) isc.log.init("b10-xfrin", buffer=True)
logger = isc.log.Logger("xfrin") logger = isc.log.Logger("xfrin")
@@ -45,13 +46,6 @@ logger = isc.log.Logger("xfrin")
DBG_PROCESS = logger.DBGLVL_TRACE_BASIC DBG_PROCESS = logger.DBGLVL_TRACE_BASIC
DBG_COMMANDS = logger.DBGLVL_TRACE_DETAIL DBG_COMMANDS = logger.DBGLVL_TRACE_DETAIL
try:
from isc.dns import *
except ImportError as e:
# C++ loadable module may not be installed; even so the xfrin process
# must keep running, so we warn about it and move forward.
logger.error(XFRIN_IMPORT_DNS, str(e))
isc.util.process.rename() isc.util.process.rename()
# If B10_FROM_BUILD is set in the environment, we use data files # If B10_FROM_BUILD is set in the environment, we use data files