[#18] Handle missing progress and job times

tg44 · Oct 4, 2020 · 461d2f6 · 461d2f6
1 parent 1224c58
commit 461d2f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/octoprint_prometheus_exporter/__init__.py b/octoprint_prometheus_exporter/__init__.py
@@ -263,9 +263,12 @@ def gcodephase_hook(self, comm_instance, phase, cmd, cmd_type, gcode, subcode=No
 			if self.print_progress_label != '':
 				data = self._printer.get_current_data()
 				#self._logger.info(data)
-				self.print_time_elapsed.labels(self.print_progress_label).set(data['progress']['printTime'])
-				self.print_time_est.labels(self.print_progress_label).set(data['job']['estimatedPrintTime'])
-				self.print_time_left_est.labels(self.print_progress_label).set(data['progress']['printTimeLeft'])
+				if data['progress']['printTime'] is not None:
+					self.print_time_elapsed.labels(self.print_progress_label).set(data['progress']['printTime'])
+				if data['progress']['printTimeLeft'] is not None:
+					self.print_time_left_est.labels(self.print_progress_label).set(data['progress']['printTimeLeft'])
+				if data['job']['estimatedPrintTime'] is not None:
+					self.print_time_est.labels(self.print_progress_label).set(data['job']['estimatedPrintTime'])
 
 		return None  # no change
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Prometheus-Exporter"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.5"
+plugin_version = "0.1.6"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module