openstack/oslo.rootwrap
Code Issues Proposed changes

Fix some spelling typo in manual

Browse Source 
explicitely -> explicitly
priviledges -> privileges
for README.rst

Plus some source comment fix.

Change-Id: Ibbe08d01e0cd380604fbd43786c8adb0ac9765f1
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
This commit is contained in:
Zhao Lei
2015-09-24 17:53:40 +08:00
parent 5c5d58ec89
commit 1c5842fa30
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@@ -102,7 +102,7 @@ filters_path
exec_dirs exec_dirs
Comma-separated list of directories to search executables in, in case Comma-separated list of directories to search executables in, in case
filters do not explicitely specify a full path. If not specified, defaults filters do not explicitly specify a full path. If not specified, defaults
to the system `PATH` environment variable. All directories listed must be to the system `PATH` environment variable. All directories listed must be
owned and only writeable by `root`. Example: owned and only writeable by `root`. Example:
``exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin`` ``exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin``
@@ -325,7 +325,7 @@ Daemon mode
Since 1.3.0 version ``oslo.rootwrap`` supports "daemon mode". In this mode Since 1.3.0 version ``oslo.rootwrap`` supports "daemon mode". In this mode
rootwrap would start, read config file and wait for commands to be run with rootwrap would start, read config file and wait for commands to be run with
root priviledges. All communications with the daemon should go through root privileges. All communications with the daemon should go through
``Client`` class that resides in ``oslo_rootwrap.client`` module. ``Client`` class that resides in ``oslo_rootwrap.client`` module.
Its constructor expects one argument - a list that can be passed to ``Popen`` Its constructor expects one argument - a list that can be passed to ``Popen``

2
oslo_rootwrap/client.py
View File

@@ -38,7 +38,7 @@ if patched_socket:
# GreenSocket.recv_into: # GreenSocket.recv_into:
# https://bitbucket.org/eventlet/eventlet/pull-request/41 # https://bitbucket.org/eventlet/eventlet/pull-request/41
# This check happens here instead of jsonrpc to avoid importing eventlet # This check happens here instead of jsonrpc to avoid importing eventlet
# from daemon code that is run with root priviledges. # from daemon code that is run with root privileges.
jsonrpc.JsonConnection.recvall = jsonrpc.JsonConnection._recvall_slow jsonrpc.JsonConnection.recvall = jsonrpc.JsonConnection._recvall_slow
try: try:

2
oslo_rootwrap/jsonrpc.py
View File

@@ -146,7 +146,7 @@ class JsonConnection(object):
def half_close(self): def half_close(self):
self._socket.shutdown(socket.SHUT_RD) self._socket.shutdown(socket.SHUT_RD)
# Unfortunatelly Python 2.6 doesn't support memoryview, so we'll have # Unfortunately Python 2.6 doesn't support memoryview, so we'll have
# to do it the slow way. # to do it the slow way.
def _recvall_slow(self, size): def _recvall_slow(self, size):
remaining = size remaining = size

2
oslo_rootwrap/tests/test_functional.py
View File

@@ -173,7 +173,7 @@ class RootwrapDaemonTest(_FunctionalBase, testtools.TestCase):
self.execute(['cat']) self.execute(['cat'])
# Make daemon go away # Make daemon go away
os.kill(self.client._process.pid, signal.SIGTERM) os.kill(self.client._process.pid, signal.SIGTERM)
# Expect client to succesfully restart daemon and run simple request # Expect client to successfully restart daemon and run simple request
self.test_run_once() self.test_run_once()
def _exec_thread(self, fifo_path): def _exec_thread(self, fifo_path):