x
/
iotronic-lightning-rod
Code Issues Proposed changes

Release 0.4.17: 

- Device Manager: added RPC actions DeviceMountFs
- Webservice Manager: improved logging messages and update_conf flag management.

Change-Id: I4e582bf543ff51bb14b4f15c810f8e89d41c38c5
This commit is contained in:
Nicola Peditto 2019-08-26 14:07:35 +02:00
parent e5d484f711
commit f4d662beb7
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
iotronic_lightningrod/modules/device_manager.py
View File

@ -244,6 +244,10 @@ class DeviceManager(Module.Module):
update_conf = parameters['update_conf']
if update_conf == "":
update_conf = False
elif update_conf == "false":
update_conf = False
elif update_conf == "true":
update_conf = True
else:
update_conf = False
@ -599,36 +603,53 @@ class DeviceManager(Module.Module):
def MountFs():
try:
command = None
# mount_rw|mount_ro|mount_status
action = parameters['action_cmd']
action = str(parameters['mnt_cmd'])
if action == "mount_rw":
command = "rootrw"
elif action == "mount_ro":
command = "rootro"
elif action == "mount_status":
command = "cat /proc/mounts"
else:
command = None
if command == None:
LOG.info(" - " + str(action) + " -> " + str(command))
if command != None:
out = subprocess.Popen(
command,
shell=True,
stdout=subprocess.PIPE
stdout=subprocess.PIPE,
stderr=subprocess.PIPE
)
message = str(out.communicate()[0].decode('utf-8').strip())
(stdout, stderr) = out.communicate()
if out.returncode != 0:
message = "Error code " + str(out.returncode) + ": '" \
+ str(stderr.decode('utf-8').strip()) + "'"
LOG.warning(message)
w_msg = WM.WampError(msg=message, req_id=req_id)
else:
message = stdout.decode('utf-8').strip()
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
else:
message = "Mount command '" + str(action) \
+ "' not supported!"
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
w_msg = WM.WampError(msg=message, req_id=req_id)
except Exception as err:
LOG.warning("--> Error in " + rpc_name + ": " + str(err))
message = str(err)
w_msg = WM.WampSuccess(msg=message, req_id=req_id)
if (req['main_request_uuid'] != None):
@ -652,6 +673,8 @@ class DeviceManager(Module.Module):
else:
w_msg = MountFs()
LOG.info(" - Result sent to Iotronic.")
return w_msg.serialize()
# SC

11
iotronic_lightningrod/modules/proxies/nginx.py
View File

@ -239,7 +239,8 @@ class ProxyManager(Proxy.Proxy):
"--agree-tos " \
"--email " + owner_email
LOG.debug(command)
LOG.info("Certbot is running:")
LOG.info(command)
certbot_result = call(command, shell=True)
LOG.info("CERTBOT RESULT: " + str(certbot_result))
@ -353,7 +354,9 @@ class ProxyManager(Proxy.Proxy):
"--domain " + str(dns_list)
"""
LOG.debug(command)
LOG.info("Certbot is running:")
LOG.info(command)
certbot_result = call(command, shell=True)
LOG.info("CERTBOT RESULT: " + str(certbot_result))
@ -406,7 +409,9 @@ class ProxyManager(Proxy.Proxy):
"--tls-sni-01-port 60000 " \
"--domain " + str(dns_list)
LOG.debug(command)
LOG.info("Certbot is running:")
LOG.info(command)
certbot_result = call(command, shell=True)
LOG.info("CERTBOT RESULT: " + str(certbot_result))