x
/
iotronic-lightning-rod
Code Issues Proposed changes

LR v0.4.10: fix WampMessages in each manager 

Change-Id: I420cc3c14d49aa97925f9bb00ea8bcb11bb474ef
This commit is contained in:
Nicola Peditto 2019-06-25 13:57:08 +02:00
parent 6efa81cd72
commit 071908ec73
4 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iotronic_lightningrod/modules/network_manager.py
View File

@ -81,13 +81,13 @@ class NetworkManager(Module.Module):
global interface
interface = 'iotronic' + str(inter_num)
message = 'WS tun and SOCAT created'
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
except Exception:
LOG.error('Error while creating the virtual interface')
message = 'Error while the creation'
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -119,7 +119,7 @@ class NetworkManager(Module.Module):
stderr=subprocess.STDOUT)
message = 'IP address assigned'
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
LOG.info("Configuration succeded")
@ -127,7 +127,7 @@ class NetworkManager(Module.Module):
LOG.error(str(e))
message = 'Error while the configuration'
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -157,13 +157,13 @@ class NetworkManager(Module.Module):
Port.remove(inter_num)
message = 'VIF removed'
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
LOG.info("VIF removed")
except Exception as e:
LOG.error(str(e))
message = 'Error while removing the VIF'
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()

52
iotronic_lightningrod/modules/plugin_manager.py
View File

@ -388,7 +388,7 @@ class PluginManager(Module.Module):
message = "ALREADY STARTED!"
LOG.warning(" - Plugin "
+ plugin_uuid + " already started!")
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
@ -443,27 +443,27 @@ class PluginManager(Module.Module):
response = "STARTED"
LOG.info(" - " + worker.complete(rpc_name, response))
w_msg = WM.WampSuccess(message=response, req_id=req_id)
w_msg = WM.WampSuccess(msg=response, req_id=req_id)
else:
message = \
rpc_name + " - ERROR " \
+ plugin_filename + " does not exist!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
message = "Plugin " + plugin_uuid \
+ " does not exist in this board!"
LOG.warning(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = \
rpc_name + " - ERROR - plugin (" + plugin_uuid + ") - " \
+ str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=str(err), req_id=req_id)
w_msg = WM.WampError(msg=str(err), req_id=req_id)
return w_msg.serialize()
@ -509,7 +509,7 @@ class PluginManager(Module.Module):
message = "STOPPED"
LOG.info(" - " + worker.complete(rpc_name, message))
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = \
@ -517,21 +517,21 @@ class PluginManager(Module.Module):
+ " - ERROR - plugin (" + plugin_uuid \
+ ") is instantiated but is not running anymore!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
message = \
rpc_name + " - WARNING " \
+ plugin_uuid + " is not running!"
LOG.warning(" - " + message)
w_msg = WM.WampWarning(message=message, req_id=req_id)
w_msg = WM.WampWarning(msg=message, req_id=req_id)
except Exception as err:
message = \
rpc_name \
+ " - ERROR - plugin (" + plugin_uuid + ") - " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=str(err), req_id=req_id)
w_msg = WM.WampError(msg=str(err), req_id=req_id)
return w_msg.serialize()
@ -562,7 +562,7 @@ class PluginManager(Module.Module):
message = "Plugin " + plugin_uuid + " already started!"
LOG.warning(" - " + message)
w_msg = WM.WampWarning(message=message, req_id=req_id)
w_msg = WM.WampWarning(msg=message, req_id=req_id)
else:
@ -593,7 +593,7 @@ class PluginManager(Module.Module):
message = "Error importing plugin " \
+ plugin_filename + ": " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=str(err), req_id=req_id)
w_msg = WM.WampError(msg=str(err), req_id=req_id)
return w_msg.serialize()
@ -631,13 +631,13 @@ class PluginManager(Module.Module):
response = q_result.get()
LOG.info(" - " + worker.complete(rpc_name, response))
w_msg = WM.WampSuccess(message=response, req_id=req_id)
w_msg = WM.WampSuccess(msg=response, req_id=req_id)
except Exception as err:
message = "Error spawning plugin " \
+ plugin_filename + ": " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=str(err), req_id=req_id)
w_msg = WM.WampError(msg=str(err), req_id=req_id)
return w_msg.serialize()
@ -646,14 +646,14 @@ class PluginManager(Module.Module):
rpc_name \
+ " - ERROR " + plugin_filename + " does not exist!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = \
rpc_name \
+ " - ERROR - plugin (" + plugin_uuid + ") - " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -684,7 +684,7 @@ class PluginManager(Module.Module):
message = "Plugin paths or files do not exist!"
LOG.error(message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -706,7 +706,7 @@ class PluginManager(Module.Module):
message = "Removing plugin's files error in " \
+ plugin_path + ": " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -744,21 +744,21 @@ class PluginManager(Module.Module):
+ plugin_uuid + " already removed!"
LOG.warning(" - " + message)
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
return w_msg.serialize()
except Exception as err:
message = "Updating plugins.json error: " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
except Exception as err:
message = "Plugin removing error: {0}".format(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -852,18 +852,18 @@ class PluginManager(Module.Module):
message = "REBOOTED"
LOG.info(" - " + worker.complete(rpc_name, message))
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = "ERROR '" + plugin_filename + "' does not exist!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = "Error rebooting plugin '" \
+ plugin_uuid + "': " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -899,20 +899,20 @@ class PluginManager(Module.Module):
result = "DEAD"
LOG.info(" - " + worker.complete(rpc_name, result))
w_msg = WM.WampSuccess(message=result, req_id=req_id)
w_msg = WM.WampSuccess(msg=result, req_id=req_id)
else:
result = "DEAD"
LOG.info(" - " + rpc_name + " result for "
+ plugin_uuid + ": " + result)
w_msg = WM.WampSuccess(message=result, req_id=req_id)
w_msg = WM.WampSuccess(msg=result, req_id=req_id)
except Exception as err:
message = \
rpc_name \
+ " - ERROR - plugin (" + plugin_uuid + ") - " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()

34
iotronic_lightningrod/modules/service_manager.py
View File

@ -928,7 +928,7 @@ class ServiceManager(Module.Module):
thr_list = str(threading.enumerate())
w_msg = WM.WampSuccess(message=thr_list, req_id=req_id)
w_msg = WM.WampSuccess(msg=thr_list, req_id=req_id)
return w_msg.serialize()
@ -971,7 +971,7 @@ class ServiceManager(Module.Module):
+ "backup is not restorable!"
LOG.error(" --> " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
@ -1007,19 +1007,19 @@ class ServiceManager(Module.Module):
LOG.info(" - " + message + " with PID " + str(service_pid))
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = "Error spawning '" + str(service_name) \
+ "' service tunnel!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = "Error exposing " + str(service_name) \
+ " service: " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -1051,7 +1051,7 @@ class ServiceManager(Module.Module):
message = "Error loading services.json file: " \
+ "backup is not restorable!"
LOG.error(" --> " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
@ -1101,7 +1101,7 @@ class ServiceManager(Module.Module):
if not lightningrod.zombie_alert:
lightningrod.zombie_alert = True
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
except Exception as err:
if err.errno == errno.ESRCH: # No such process
@ -1122,7 +1122,7 @@ class ServiceManager(Module.Module):
lightningrod.zombie_alert = True
w_msg = WM.WampWarning(
message=message, req_id=req_id
msg=message, req_id=req_id
)
else:
@ -1136,19 +1136,19 @@ class ServiceManager(Module.Module):
lightningrod.zombie_alert = True
w_msg = WM.WampError(
message=message, req_id=req_id
msg=message, req_id=req_id
)
else:
message = rpc_name + " result: " + s_uuid \
+ " already removed!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = "Updating services.json error: " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()
@ -1176,7 +1176,7 @@ class ServiceManager(Module.Module):
message = "Error loading services.json file: " \
+ "backup is not restorable!"
LOG.error(" --> " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
@ -1246,7 +1246,7 @@ class ServiceManager(Module.Module):
if not lightningrod.zombie_alert:
lightningrod.zombie_alert = True
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = "Error spawning " + str(service_name) \
@ -1257,13 +1257,13 @@ class ServiceManager(Module.Module):
if not lightningrod.zombie_alert:
lightningrod.zombie_alert = True
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
message = "Error restoring '" + str(service_name) \
+ "' service tunnel: " + str(err)
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
@ -1301,13 +1301,13 @@ class ServiceManager(Module.Module):
+ str(public_port) + " on " + self.wstun_ip
LOG.info(" - " + message + " with PID " + str(service_pid))
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = "Error spawning " + str(service_name) \
+ " service tunnel!"
LOG.error(" - " + message)
w_msg = WM.WampError(message=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
return w_msg.serialize()

12
iotronic_lightningrod/modules/webservice_manager.py
View File

@ -189,10 +189,10 @@ class WebServiceManager(Module.Module):
if(response['result'] == "SUCCESS"):
message = "Webservice '" + service_dns + "' successfully exposed!"
LOG.info("--> " + str(message))
w_msg = WM.WampSuccess(message=response, req_id=req_id)
w_msg = WM.WampSuccess(msg=response, req_id=req_id)
else:
LOG.warning("--> " + str(response['message']))
w_msg = WM.WampWarning(message=response, req_id=req_id)
w_msg = WM.WampWarning(msg=response, req_id=req_id)
return w_msg.serialize()
@ -211,10 +211,10 @@ class WebServiceManager(Module.Module):
if (response['result'] == "SUCCESS"):
LOG.info("--> " + str(response['message']))
w_msg = WM.WampSuccess(message=response, req_id=req_id)
w_msg = WM.WampSuccess(msg=response, req_id=req_id)
else:
LOG.warning("--> " + str(response['message']))
w_msg = WM.WampWarning(message=response, req_id=req_id)
w_msg = WM.WampWarning(msg=response, req_id=req_id)
return w_msg.serialize()
@ -231,7 +231,7 @@ class WebServiceManager(Module.Module):
board_dns,
owner_email
)
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
return w_msg.serialize()
@ -245,6 +245,6 @@ class WebServiceManager(Module.Module):
message = self.board.proxy._proxyDisableWebService()
w_msg = WM.WampSuccess(message=message, req_id=req_id)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
return w_msg.serialize()