arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Improve checks when starting IOU.

Browse Source
This commit is contained in:
grossmj 2014-04-10 18:48:43 -06:00
parent 4ab9b4acc7
commit fca399a5ab
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/modules/dynamips/__init__.py
View File

@ -127,8 +127,8 @@ class Dynamips(IModule):
Properly stops the module. Properly stops the module.
""" """
#if not sys.platform.startswith("win32"): if not sys.platform.startswith("win32"):
# self._callback.stop() self._callback.stop()
if self._hypervisor_manager: if self._hypervisor_manager:
self._hypervisor_manager.stop_all_hypervisors() self._hypervisor_manager.stop_all_hypervisors()
IModule.stop(self) # this will stop the I/O loop IModule.stop(self) # this will stop the I/O loop

14
gns3server/modules/iou/iou_device.py
View File

@ -402,8 +402,9 @@ class IOUDevice(object):
log.info("iouyap started PID={}".format(self._iouyap_process.pid)) log.info("iouyap started PID={}".format(self._iouyap_process.pid))
except OSError as e: except OSError as e:
log.error("could not start iouyap: {}".format(e)) iouyap_stdout = self.read_iouyap_stdout()
raise IOUError("Could not start iouyap: {}".format(e)) log.error("could not start iouyap: {}\n{}".format(e, iouyap_stdout))
raise IOUError("Could not start iouyap: {}\n{}".format(e, iouyap_stdout))
def start(self): def start(self):
""" """
@ -411,6 +412,10 @@ class IOUDevice(object):
""" """
if not self.is_running(): if not self.is_running():
if not os.path.exists(self._path):
raise IOUError("IOU '{}' is not accessible".format(self._path))
if not self._iourc or not os.path.exists(self._iourc): if not self._iourc or not os.path.exists(self._iourc):
raise IOUError("A iourc file is necessary to start IOU") raise IOUError("A iourc file is necessary to start IOU")
@ -435,8 +440,9 @@ class IOUDevice(object):
log.info("IOU instance {} started PID={}".format(self._id, self._process.pid)) log.info("IOU instance {} started PID={}".format(self._id, self._process.pid))
self._started = True self._started = True
except OSError as e: except OSError as e:
log.error("could not start IOU: {}".format(e)) iou_stdout = self.read_iou_stdout()
raise IOUError("could not start IOU: {}".format(e)) log.error("could not start IOU: {}\n{}".format(e, iou_stdout))
raise IOUError("could not start IOU: {}\n{}".format(e, iou_stdout))
# start console support # start console support
self._start_ioucon() self._start_ioucon()