Errors and debug print as comment

This commit is contained in:
Antonio J. Delgado 2022-12-26 20:09:13 +02:00
parent edcc593322
commit 78cbd3e90f
4 changed files with 9 additions and 9 deletions

View file

@ -7,7 +7,7 @@ Homepage = "https://susurrando.com"
[project] [project]
name = "restic_exporter" name = "restic_exporter"
version = "0.0.9" version = "0.0.10"
description = "Export to node exporter the summary of a restic backup" description = "Export to node exporter the summary of a restic backup"
readme = "README.md" readme = "README.md"
authors = [{ name = "Antonio J. Delgado", email = "ad@susurrando.com" }] authors = [{ name = "Antonio J. Delgado", email = "ad@susurrando.com" }]

View file

@ -65,7 +65,7 @@ class restic_exporter:
with open(json_file, 'r') as file_pointer: with open(json_file, 'r') as file_pointer:
content = file_pointer.readlines() content = file_pointer.readlines()
except Exception as error: except Exception as error:
self._log.error(f"Error reading file '{json_file}'. Check permissions. {error}") self._log.error(f"# Error reading file '{json_file}'. Check permissions. {error}")
self.summary = {} self.summary = {}
for line in content: for line in content:
@ -77,11 +77,11 @@ class restic_exporter:
if 'snapshot_id' in line_data: if 'snapshot_id' in line_data:
self.labels["snapshot_id"] = line_data['snapshot_id'] self.labels["snapshot_id"] = line_data['snapshot_id']
except json.decoder.JSONDecodeError as error: except json.decoder.JSONDecodeError as error:
self._log.error(f"Error decoding line '{line}'. {error}") self._log.error(f"# Error decoding line '{line}'. {error}")
file_stats = os.stat(json_file) file_stats = os.stat(json_file)
self.summary['timestamp'] = round(file_stats.st_mtime * 1000) self.summary['timestamp'] = round(file_stats.st_mtime * 1000)
self._log.debug(f"Summary: {json.dumps(self.summary, indent=2)}") self._log.debug(f"# Summary: {json.dumps(self.summary, indent=2)}")
self._log.debug(f"Labels: {self.labels}") self._log.debug(f"# Labels: {self.labels}")
def _read_extra_labels(self, extra_labels): def _read_extra_labels(self, extra_labels):
labels_ls = {} labels_ls = {}
@ -89,7 +89,7 @@ class restic_exporter:
if '=' in pair: if '=' in pair:
k, v=pair.split('=', 1) k, v=pair.split('=', 1)
labels_ls[k] = v labels_ls[k] = v
self._log.debug(f"Added extra label '{k}'='{v}'") self._log.debug(f"# Added extra label '{k}'='{v}'")
return labels_ls return labels_ls
def _convert_labels(self, labels): def _convert_labels(self, labels):
@ -98,7 +98,7 @@ class restic_exporter:
labels_ls.append(f"{key}=\"{labels[key]}\"") labels_ls.append(f"{key}=\"{labels[key]}\"")
text_labels = ','.join(labels_ls) text_labels = ','.join(labels_ls)
labels_string = "{" + text_labels + "}" labels_string = "{" + text_labels + "}"
self._log.debug(f"Labels: {labels_string}") self._log.debug(f"# Labels: {labels_string}")
return labels_string return labels_string

View file

@ -1,6 +1,6 @@
[metadata] [metadata]
name = restic_exporter name = restic_exporter
version = 0.0.9 version = 0.0.10
[options] [options]
packages = restic_exporter packages = restic_exporter

View file

@ -2,7 +2,7 @@ import setuptools
setuptools.setup( setuptools.setup(
scripts=['restic_exporter/restic_exporter.py'], scripts=['restic_exporter/restic_exporter.py'],
author="Antonio J. Delgado", author="Antonio J. Delgado",
version='0.0.9', version='0.0.10',
name='restic_exporter', name='restic_exporter',
author_email="", author_email="",
url="", url="",