Replaced os.strerror calls by exc.strerror (bec3b2c1) · Commits · Mirror / cc-node

cloudcontrol/node/hypervisor/init.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ class Handler(HostHandler):
		rpid, status = os.waitpid(pid, os.WNOHANG)
		except OSError as exc:
		logger.error('Error while waiting for child to terminate: %s',
		os.strerror(exc.errno))
		exc.strerror)
		raise

		# convert status to return status
		@@ -462,7 +462,7 @@ class Handler(HostHandler):
		rpid, status = os.waitpid(pid, 0)
		except OSError as exc:
		logger.error('Error while waiting for child after killing'
		' it: %s', os.strerror(exc.errno))
		' it: %s', exc.strerror)
		raise

		assert rpid == pid, 'PID returned by waitpid is not valid'

+4 −5

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ class ExportVolume(BaseIOJob):
		self.sock.connect((self.raddr, self.rport))
		except socket.error as exc:
		logger.exception('Error while trying to connect to remote host %s',
		os.strerror(exc.errno))
		exc.strerror)
		self.clean_fds()
		raise

		@@ -451,7 +451,7 @@ class TCPTunnel(ForkedJob):
		self.source_sock.setblocking(0)
		except socket.error as exc:
		self.fatal_exc('Cannot set source socket in non blocking for'
		' tunnel job: %s', os.strerror(exc.errno))
		' tunnel job: %s', exc.strerror)
		self.source_reader.stop()
		self.source_reader = self.ev_loop.io(new_source, pyev.EV_READ,
		self.read_cb)
		@@ -508,7 +508,7 @@ class TCPTunnel(ForkedJob):
		break
		# else: unexpected error
		self.fatal_exc('Unexpected error while reading on socket'
		' for tunnel job, %s\n', os.strerror(exc.errno))
		' for tunnel job, %s\n', exc.strerror)

		if not incoming:
		# EOF
		@@ -561,8 +561,7 @@ class TCPTunnel(ForkedJob):
		break
		# else: unexpected error
		self.fatal_exc('Unexpected error while writting on socket'
		' for tunnel job, %s',
		os.strerror(exc.errno))
		' for tunnel job, %s', exc.strerror)

		# sys.stderr.write('Written %d bytes\n' % written)
		if written == len(send_buffer):

+4 −6

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ class ForkedJob(object):
		try:
		self.fork_pid = os.fork()
		except OSError as exc:
		logger.error('Cannot fork (job %s): %s', self.id, os.strerror(exc.errno))
		logger.error('Cannot fork (job %s): %s', self.id, exc.strerror)
		raise
		self.running = True

		@@ -317,7 +317,7 @@ class ForkedJob(object):
		' EBADF (job %s', fd, self.id)
		continue
		logger.error('Error while closing fds in parent: %s',
		os.strerror(exc.errno))
		exc.strerror)
		raise

		def start(self):
		@@ -342,8 +342,7 @@ class ForkedJob(object):
		logger.debug('Child already killed')
		return

		logger.error('Cannot kill child for IO job: %s',
		os.strerror(exc.errno))
		logger.error('Cannot kill child for IO job: %s', exc.strerror)
		raise

		def notify(self):
		@@ -367,8 +366,7 @@ class ForkedJob(object):
		continue

		logger.error('Error while waiting for child to terminate:'
		' %s (job %s)',
		os.strerror(exc.errno), self.id)
		' %s (job %s)', exc.strerror, self.id)
		raise
		else:
		break