48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

live: revisit logging for partition setup, image create and restore

master
OpenGnSys Support Team 2024-04-23 10:30:36 +02:00
parent 7d26f0f69b
commit 84c2944bf3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/live/ogOperations.py
View File

@ -151,7 +151,7 @@ class OgLiveOperations:
if ogChangeRepo(repo, smb_user=self._smb_user, smb_pass=self._smb_pass) != 0: if ogChangeRepo(repo, smb_user=self._smb_user, smb_pass=self._smb_pass) != 0:
self._restartBrowser(self._url) self._restartBrowser(self._url)
raise OgError(f'Cannot change repository to {repo}') raise OgError(f'Cannot change repository to {repo}')
logging.debug(f'restore_image_unicast: name => {name}')
if cache: if cache:
image_path = f'/opt/opengnsys/cache/opt/opengnsys/images/{name}.img' image_path = f'/opt/opengnsys/cache/opt/opengnsys/images/{name}.img'
if (not os.path.exists(image_path) or if (not os.path.exists(image_path) or
@ -362,7 +362,7 @@ class OgLiveOperations:
else: else:
mkfs(fs, int(disk), partition) mkfs(fs, int(disk), partition)
logging.info('Setup command OK') logging.info('Partition setup command OK')
result = self.refresh(ogRest) result = self.refresh(ogRest)
self._restartBrowser(self._url) self._restartBrowser(self._url)
@ -382,11 +382,7 @@ class OgLiveOperations:
self._ogbrowser_clear_logs() self._ogbrowser_clear_logs()
self._restartBrowser(self._url_log) self._restartBrowser(self._url_log)
logging.debug('Image restore params:') logging.info(f'Request to restore image {name}.img via {ctype} from {repo}')
logging.debug(f'\tname: {name}')
logging.debug(f'\trepo: {repo}')
logging.debug(f'\tprofile: {profile}')
logging.debug(f'\tctype: {ctype}')
if shutil.which('restoreImageCustom'): if shutil.which('restoreImageCustom'):
restoreImageCustom(repo, name, disk, partition, ctype) restoreImageCustom(repo, name, disk, partition, ctype)
@ -418,6 +414,8 @@ class OgLiveOperations:
self._restartBrowser(self._url) self._restartBrowser(self._url)
raise OgError(f'Cannot change image repository to {repo}') raise OgError(f'Cannot change image repository to {repo}')
logging.info(f'Request to create image {name}.img at repository {repo}')
if ogRest.terminated: if ogRest.terminated:
return return