Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
450
Issues
450
List
Boards
Labels
Service Desk
Milestones
Merge Requests
75
Merge Requests
75
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
a0f6b0ff
Commit
a0f6b0ff
authored
Sep 05, 2013
by
Tomek Mrugalski
🛰
Browse files
Options
Browse Files
Download
Plain Diff
[master] Merge branch 'master' of
ssh://git.bind10.isc.org/var/bind10/git/bind10
parents
b3172918
44af79cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
29 deletions
+28
-29
configure.ac
configure.ac
+0
-1
src/lib/python/bind10_config.py.in
src/lib/python/bind10_config.py.in
+25
-0
src/lib/python/isc/server_common/Makefile.am
src/lib/python/isc/server_common/Makefile.am
+0
-1
src/lib/python/isc/server_common/bind10_server.py
src/lib/python/isc/server_common/bind10_server.py
+3
-27
No files found.
configure.ac
View file @
a0f6b0ff
...
...
@@ -1471,7 +1471,6 @@ AC_OUTPUT([doc/version.ent
src/lib/python/isc/notify/tests/notify_out_test
src/lib/python/isc/log/tests/log_console.py
src/lib/python/isc/log_messages/work/__init__.py
src/lib/python/isc/server_common/bind10_server.py
src/lib/dns/gen-rdatacode.py
src/lib/python/bind10_config.py
src/lib/cc/session_config.h.pre
...
...
src/lib/python/bind10_config.py.in
View file @
a0f6b0ff
...
...
@@ -17,6 +17,31 @@
# variables to python scripts and libraries.
import os
def get_specfile_location(module_name):
"""Return the path to the module spec file following common convetion.
This method generates the path commonly used by most BIND 10
modules, determined by a well known prefix and the module name.
A specific module can override this method if it uses a different
path for the spec file.
"""
# First check if it's running under an 'in-source' environment,
# then try commonly used paths and file names. If found, use it.
for ev in ['B10_FROM_SOURCE', 'B10_FROM_BUILD']:
if ev in os.environ:
specfile = os.environ[ev] + '/src/bin/' + module_name + \
'/' + module_name + '.spec'
if os.path.exists(specfile):
return specfile
# Otherwise, just use the installed path, whether or not it really
# exists; leave error handling to the caller.
specfile_path = '@datadir@/@PACKAGE@'\
.replace('${datarootdir}', '@datarootdir@')\
.replace('${prefix}', '@prefix@')
return specfile_path + '/' + module_name + '.spec'
def reload():
# In a function, for testing purposes
global BIND10_MSGQ_SOCKET_FILE
...
...
src/lib/python/isc/server_common/Makefile.am
View file @
a0f6b0ff
...
...
@@ -7,7 +7,6 @@ python_PYTHON += logger.py
pythondir
=
$(pyexecdir)
/isc/server_common
BUILT_SOURCES
=
$(PYTHON_LOGMSGPKG_DIR)
/work/server_common_messages.py
BUILT_SOURCES
+=
bind10_server.py
nodist_pylogmessage_PYTHON
=
$(PYTHON_LOGMSGPKG_DIR)
/work/server_common_messages.py
...
...
src/lib/python/isc/server_common/bind10_server.py
.in
→
src/lib/python/isc/server_common/bind10_server.py
View file @
a0f6b0ff
...
...
@@ -18,6 +18,7 @@ import os
import
select
import
signal
import
bind10_config
import
isc.log
import
isc.config
from
isc.server_common.logger
import
logger
...
...
@@ -98,35 +99,10 @@ class BIND10Server:
"""
self
.
_mod_cc
=
isc
.
config
.
ModuleCCSession
(
self._get_specfile_location(), self._config_handler
,
self._command_handler)
bind10_config
.
get_specfile_location
(
self
.
__module_name
)
,
self
.
_co
nfig_handler
,
self
.
_co
mmand_handler
)
self
.
_mod_cc
.
start
()
def _get_specfile_location(self):
"""Return the path to the module spec file following common convetion.
This method generates the path commonly used by most BIND 10 modules,
determined by a well known prefix and the module name.
A specific module can override this method if it uses a different
path for the spec file.
"""
# First check if it's running under an 'in-source' environment,
# then try commonly used paths and file names. If found, use it.
for ev in ['B10_FROM_SOURCE', 'B10_FROM_BUILD']:
if ev in os.environ:
specfile = os.environ[ev] + '/src/bin/' + self.__module_name +\
'/' + self.__module_name + '.spec'
if os.path.exists(specfile):
return specfile
# Otherwise, just use the installed path, whether or not it really
# exists; leave error handling to the caller.
specfile_path = '${datarootdir}/bind10'\
.replace('${datarootdir}', '${prefix}/share')\
.replace('${prefix}', '/Users/jinmei/opt')
return specfile_path + '/' + self.__module_name + '.spec'
def
_trigger_shutdown
(
self
):
"""Initiate a shutdown sequence.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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