Skip to content
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

Monitor: Find completed devices correctly. #67

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Monitor: Find completed devices correctly. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a58d7ca
provisioner: Explicitly delete temporary config signature file
tdewey-rpi Oct 8, 2024
2856428
monitor.py: Remove redundant arguments
tdewey-rpi Oct 8, 2024
22c3e46
monitor: Find completed devices by logs
tdewey-rpi Oct 8, 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
14 changes: 5 additions & 9 deletions monitor/monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ def on_mount(self) -> None:
self.set_interval(1/20, self.update_devices)

class CompletedDevicesList(Widget):
dev_type_g = ""
devices=reactive(tuple[str, int])
def compose(self) -> ComposeResult:
yield DataTable()
def __init__(self, dev_type):
self.dev_type = dev_type
def __init__(self):
super().__init__()
def update_devices(self) -> None:
self.devices = systemctl_python.list_completed_devices()
Expand All @@ -61,13 +59,11 @@ def on_mount(self) -> None:
table.add_rows(ROWS[1:])
self.set_interval(1/20, self.update_devices)

class Failed_devices_list(Static):
dev_type_g = ""
class FailedDevicesList(Static):
devices=reactive(tuple[str, int])
def compose(self) -> ComposeResult:
yield DataTable()
def __init__(self, dev_type):
self.dev_type = dev_type
def __init__(self):
super().__init__()
def update_devices(self) -> None:
self.devices = systemctl_python.list_failed_devices()
Expand Down Expand Up @@ -97,11 +93,11 @@ def compose(self) -> ComposeResult:

class Completed_Box(Static):
def compose(self) -> ComposeResult:
yield ScrollableContainer(Static("Completed \n----------------"), CompletedDevicesList(dev_type="provision"))
yield ScrollableContainer(Static("Completed \n----------------"), CompletedDevicesList())

class Failed_Box(Static):
def compose(self) -> ComposeResult:
yield ScrollableContainer(Static("Failed \n----------------"), Failed_devices_list(dev_type="provision"))
yield ScrollableContainer(Static("Failed \n----------------"), FailedDevicesList())

class Processing(Static):
def compose(self) -> ComposeResult:
Expand Down
6 changes: 4 additions & 2 deletions monitor/systemctl_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ def list_seen_devices():

return units


# Completed devices don't show up as systemd units, so we _must_ fall back to the log files
def list_completed_devices():
all_devices = list_seen_devices()
all_devices = []
if os.path.exists("/var/log/rpi-sb-provisioner/"):
all_devices = os.listdir("/var/log/rpi-sb-provisioner")
completed_devices = []
for device in all_devices:
if os.path.exists("/var/log/rpi-sb-provisioner/" + device + "/progress"):
Expand Down
1 change: 1 addition & 0 deletions service/rpi-sb-provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ update_eeprom() {
--out "${dst_image}" ${sign_args} \
"${dst_image}.intermediate" || die "Failed to update EEPROM image"
rm -f "${dst_image}.intermediate"
rm -f "${TMP_CONFIG_SIG}"
set +x

cat <<EOF
Expand Down