mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-01 04:38:12 +00:00
Cleanup
This commit is contained in:
parent
3a157b5e6d
commit
5f9554b86c
@ -174,13 +174,10 @@ class IModule(multiprocessing.Process):
|
|||||||
:param results: JSON results to the ZeroMQ server
|
:param results: JSON results to the ZeroMQ server
|
||||||
"""
|
"""
|
||||||
|
|
||||||
log.error('got here 4')
|
|
||||||
jsonrpc_response = jsonrpc.JSONRPCResponse(results, self._current_call_id)()
|
jsonrpc_response = jsonrpc.JSONRPCResponse(results, self._current_call_id)()
|
||||||
|
|
||||||
# add session to the response
|
# add session to the response
|
||||||
response = [self._current_session, jsonrpc_response]
|
response = [self._current_session, jsonrpc_response]
|
||||||
log.error("ZeroMQ client ({}) sending: {}".format(self.name, response))
|
|
||||||
log.error('got here 5')
|
|
||||||
self._stream.send_json(response)
|
self._stream.send_json(response)
|
||||||
|
|
||||||
def send_param_error(self):
|
def send_param_error(self):
|
||||||
|
@ -201,7 +201,6 @@ class VM(object):
|
|||||||
if self._hypervisor_manager.ghost_ios_support:
|
if self._hypervisor_manager.ghost_ios_support:
|
||||||
self.set_ghost_ios(router)
|
self.set_ghost_ios(router)
|
||||||
|
|
||||||
log.error('got here 1')
|
|
||||||
except DynamipsError as e:
|
except DynamipsError as e:
|
||||||
dynamips_stdout = ""
|
dynamips_stdout = ""
|
||||||
if hypervisor:
|
if hypervisor:
|
||||||
@ -211,7 +210,6 @@ class VM(object):
|
|||||||
self._hypervisor_manager.hypervisors.remove(hypervisor)
|
self._hypervisor_manager.hypervisors.remove(hypervisor)
|
||||||
dynamips_stdout = hypervisor.read_stdout()
|
dynamips_stdout = hypervisor.read_stdout()
|
||||||
self.send_custom_error(str(e) + dynamips_stdout)
|
self.send_custom_error(str(e) + dynamips_stdout)
|
||||||
log.error('got here 2')
|
|
||||||
return
|
return
|
||||||
|
|
||||||
response = {"name": router.name,
|
response = {"name": router.name,
|
||||||
@ -219,7 +217,6 @@ class VM(object):
|
|||||||
defaults = router.defaults()
|
defaults = router.defaults()
|
||||||
response.update(defaults)
|
response.update(defaults)
|
||||||
self._routers[router.id] = router
|
self._routers[router.id] = router
|
||||||
log.error('got here 3 {}'.format(response))
|
|
||||||
self.send_response(response)
|
self.send_response(response)
|
||||||
|
|
||||||
@IModule.route("dynamips.vm.delete")
|
@IModule.route("dynamips.vm.delete")
|
||||||
|
Loading…
Reference in New Issue
Block a user