mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2025-01-03 11:21:44 +01:00
remove old downloadlog function
This commit is contained in:
parent
858c71856d
commit
f5593fdc1f
1 changed files with 0 additions and 59 deletions
|
@ -72,65 +72,6 @@ class SystemController:
|
||||||
print(e)
|
print(e)
|
||||||
return tabulate(result, headers="keys")
|
return tabulate(result, headers="keys")
|
||||||
|
|
||||||
async def downloadlog_old(self, logtime):
|
|
||||||
filename = "cbpi4.log"
|
|
||||||
fullname = pathlib.Path(os.path.join(".",filename))
|
|
||||||
pluginname = "cbpi4_plugins.txt"
|
|
||||||
fullpluginname = pathlib.Path(os.path.join(".",pluginname))
|
|
||||||
actorname = "cbpi4_actors.txt"
|
|
||||||
fullactorname = pathlib.Path(os.path.join(".",actorname))
|
|
||||||
sensorname = "cbpi4_sensors.txt"
|
|
||||||
fullsensorname = pathlib.Path(os.path.join(".",sensorname))
|
|
||||||
kettlename = "cbpi4_kettles.txt"
|
|
||||||
fullkettlename = pathlib.Path(os.path.join(".",kettlename))
|
|
||||||
|
|
||||||
output_filename="cbpi4_log.zip"
|
|
||||||
|
|
||||||
if logtime == "b":
|
|
||||||
os.system('journalctl -b -u craftbeerpi.service --output cat > {}'.format(fullname))
|
|
||||||
else:
|
|
||||||
os.system('journalctl --since \"{} hours ago\" -u craftbeerpi.service --output cat > {}'.format(logtime, fullname))
|
|
||||||
|
|
||||||
plugins = await self.plugins_list()
|
|
||||||
|
|
||||||
with open(fullpluginname, 'w') as f:
|
|
||||||
f.write(plugins)
|
|
||||||
|
|
||||||
#os.system('echo "{}" >> {}'.format(plugins,fullpluginname))
|
|
||||||
|
|
||||||
try:
|
|
||||||
actors = self.cbpi.actor.get_state()
|
|
||||||
json.dump(actors['data'],open(fullactorname,'w'),indent=4, sort_keys=True)
|
|
||||||
sensors = self.cbpi.sensor.get_state()
|
|
||||||
json.dump(sensors['data'],open(fullsensorname,'w'),indent=4, sort_keys=True)
|
|
||||||
kettles = self.cbpi.kettle.get_state()
|
|
||||||
json.dump(kettles['data'],open(fullkettlename,'w'),indent=4, sort_keys=True)
|
|
||||||
except Exception as e:
|
|
||||||
logging.info(e)
|
|
||||||
self.cbpi.notify("Error", "Creation of files failed: {}".format(e), NotificationType.ERROR)
|
|
||||||
|
|
||||||
try:
|
|
||||||
zipObj=zipfile.ZipFile(output_filename , 'w', zipfile.ZIP_DEFLATED)
|
|
||||||
zipObj.write(fullname)
|
|
||||||
zipObj.write(fullpluginname)
|
|
||||||
zipObj.write(fullactorname)
|
|
||||||
zipObj.write(fullsensorname)
|
|
||||||
zipObj.write(fullkettlename)
|
|
||||||
zipObj.close()
|
|
||||||
except Exception as e:
|
|
||||||
logging.info(e)
|
|
||||||
self.cbpi.notify("Error", "Zip creation failed: {}".format(e), NotificationType.ERROR)
|
|
||||||
|
|
||||||
try:
|
|
||||||
os.remove(fullname)
|
|
||||||
os.remove(fullpluginname)
|
|
||||||
os.remove(fullactorname)
|
|
||||||
os.remove(fullsensorname)
|
|
||||||
os.remove(fullkettlename)
|
|
||||||
except Exception as e:
|
|
||||||
logging.info(e)
|
|
||||||
self.cbpi.notify("Error", "Removal of original files failed: {}".format(e), NotificationType.ERROR)
|
|
||||||
|
|
||||||
async def downloadlog(self, logtime):
|
async def downloadlog(self, logtime):
|
||||||
filename = "cbpi4.log"
|
filename = "cbpi4.log"
|
||||||
fullname = pathlib.Path(os.path.join(".",filename))
|
fullname = pathlib.Path(os.path.join(".",filename))
|
||||||
|
|
Loading…
Reference in a new issue