Skip to content

Fix print time metrics not being cleared correctly #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hyperair wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix print time metrics not being cleared correctly #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8160060
Fix print time metrics not being cleared correctly
hyperair Feb 2, 2024
3b7e0a8
Fix args passing to Timer
hyperair Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions octoprint_prometheus_exporter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ def print_complete_callback(self):
self.print_completion_timer = None

def print_deregister_callback(self, label):
if label != '':
self.metrics.print_progress.remove(label)
self.metrics.print_time_elapsed.remove(label)
self.metrics.print_time_est.remove(label)
self.metrics.print_time_left_est.remove(label)
if label == '':
return

self.metrics.print_progress.remove(label)
self.metrics.print_time_elapsed.remove(label)
self.metrics.print_time_est.remove(label)
self.metrics.print_time_left_est.remove(label)
self.print_progress_label = ''

def slice_deregister_callback(self, label):
Expand All @@ -74,7 +76,11 @@ def print_complete(self):

self.print_completion_timer = Timer(30, self.print_complete_callback)
self.print_completion_timer.start()
Timer(30, lambda: self.print_deregister_callback(self.print_progress_label)).start()

# capture the current print_progress_label in the timer object and immediately clear it to avoid reintroducing
# the label onto the print time metrics when gcode is sent during print_deregister_callback's execution
Timer(30, self.print_deregister_callback, [self.print_progress_label]).start()
self.print_progress_label = ''

def deactivateMetricsIfOffline(self, payload):
if payload['state_id'] == 'OFFLINE':
Expand Down Expand Up @@ -208,7 +214,7 @@ def get_update_information(self):
pip="https://github.com/tg44/OctoPrint-Prometheus-Exporter/archive/{target_version}.zip"
)
)

def is_blueprint_protected(self):
# Disable global protection, use permission system.
return False
Expand Down