|
@@ -26,6 +26,7 @@ from isc.auth import sqlite3_ds
|
|
|
from socketserver import *
|
|
|
import os
|
|
|
from isc.config.ccsession import *
|
|
|
+from isc.cc import SessionError
|
|
|
import socket
|
|
|
from optparse import OptionParser, OptionValueError
|
|
|
try:
|
|
@@ -322,8 +323,8 @@ class XfroutServer:
|
|
|
self._shutdown_event = threading.Event()
|
|
|
self._cc = isc.config.ModuleCCSession(SPECFILE_LOCATION, self.config_handler, self.command_handler)
|
|
|
self._config_data = self._cc.get_full_config()
|
|
|
- self._start_xfr_query_listener()
|
|
|
self._cc.start()
|
|
|
+ self._start_xfr_query_listener()
|
|
|
|
|
|
|
|
|
def _start_xfr_query_listener(self):
|
|
@@ -412,9 +413,12 @@ if '__main__' == __name__:
|
|
|
xfrout_server.run()
|
|
|
except KeyboardInterrupt:
|
|
|
print("[b10-xfrout] exit xfrout process")
|
|
|
- except Exception as e:
|
|
|
- print('[b10-xfrout] ', e)
|
|
|
-
|
|
|
+ except SessionError as e:
|
|
|
+ print('[b10-xfrout] Error creating xfrout, '
|
|
|
+ 'is the command channel daemon running?' )
|
|
|
+ except ModuleCCSessionError as e:
|
|
|
+ print('[b10-xfrout] exit xfrout process:', e)
|
|
|
+
|
|
|
if xfrout_server:
|
|
|
xfrout_server.shutdown()
|
|
|
|