postgresql-charms-single-kernel 16.3.25__tar.gz → 16.3.26__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (110) hide show
  1. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/PKG-INFO +2 -2
  2. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/pyproject.toml +2 -2
  3. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/pyproject.toml.orig +2 -2
  4. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/charms/abstract_charm.py +9 -0
  5. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/charms/k8s_charm.py +0 -7
  6. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/charms/vm_charm.py +43 -49
  7. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/postgresql.py +3 -3
  8. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/patroni.py +15 -15
  9. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/refresh.py +40 -69
  10. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/scripts/raft_observer.py +2 -2
  11. postgresql_charms_single_kernel-16.3.26/single_kernel_postgresql/utils/snap.py +104 -0
  12. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/vm.py +36 -46
  13. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/LICENSE +0 -0
  14. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/README.md +0 -0
  15. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/__init__.py +0 -0
  16. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/charms/__init__.py +0 -0
  17. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/compat/__init__.py +0 -0
  18. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/compat/postgresql.py +0 -0
  19. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/compat/pyproject.toml +0 -0
  20. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/__init__.py +0 -0
  21. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/enums.py +0 -0
  22. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/exceptions.py +0 -0
  23. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/literals.py +0 -0
  24. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/locales.py +0 -0
  25. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/pyproject.toml +0 -0
  26. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/config/statuses.py +0 -0
  27. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/__init__.py +0 -0
  28. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/config.py +0 -0
  29. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/peer_relation.py +0 -0
  30. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/relation_state.py +0 -0
  31. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/s3.py +0 -0
  32. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/core/state.py +0 -0
  33. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/__init__.py +0 -0
  34. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/async_replication.py +0 -0
  35. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/backup.py +0 -0
  36. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/database.py +0 -0
  37. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/ldap.py +0 -0
  38. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/logical_replication.py +0 -0
  39. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/observer.py +0 -0
  40. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/tls.py +0 -0
  41. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/tls_transfer.py +0 -0
  42. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/events/watcher.py +0 -0
  43. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/certificate_transfer_interface/v0/certificate_transfer.py +0 -0
  44. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/data_interfaces.py +0 -0
  45. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/s3.py +0 -0
  46. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/data_platform_libs/v1/data_models.py +0 -0
  47. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/glauth_k8s/v0/ldap.py +0 -0
  48. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/grafana_agent/v0/cos_agent.py +0 -0
  49. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/grafana_k8s/v0/grafana_dashboard.py +0 -0
  50. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/loki_k8s/v1/loki_push_api.py +0 -0
  51. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/prometheus_k8s/v0/prometheus_scrape.py +0 -0
  52. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/lib/charms/rolling_ops/v0/rollingops.py +0 -0
  53. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/__init__.py +0 -0
  54. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/async_replication.py +0 -0
  55. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/backup.py +0 -0
  56. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/base.py +0 -0
  57. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/cluster.py +0 -0
  58. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/cluster_membership.py +0 -0
  59. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/config.py +0 -0
  60. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/database.py +0 -0
  61. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/k8s.py +0 -0
  62. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/logical_replication.py +0 -0
  63. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/observer.py +0 -0
  64. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/raft.py +0 -0
  65. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/restore.py +0 -0
  66. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/managers/tls.py +0 -0
  67. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/grafana_dashboards/postgresql-metrics.json +0 -0
  68. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/grafana_dashboards/postgresql-patroni-metrics.json +0 -0
  69. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/grafana_dashboards/postgresql-pgbackrest-metrics.json +0 -0
  70. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/loki_alert_rules/.gitkeep +0 -0
  71. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/prometheus_alert_rules/patroni_rules.yaml +0 -0
  72. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/prometheus_alert_rules/pgbackrest_rules.yaml +0 -0
  73. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/prometheus_alert_rules/pgbouncer_rules.yaml +0 -0
  74. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/k8s/prometheus_alert_rules/postgresql_rules.yaml +0 -0
  75. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/grafana_dashboards/postgresql-metrics.json +0 -0
  76. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/grafana_dashboards/postgresql-patroni-metrics.json +0 -0
  77. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/grafana_dashboards/postgresql-pgbackrest-metrics.json +0 -0
  78. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/loki_alert_rules/.gitkeep +0 -0
  79. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/prometheus_alert_rules/patroni_rules.yaml +0 -0
  80. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/prometheus_alert_rules/pgbackrest_rules.yaml +0 -0
  81. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/prometheus_alert_rules/pgbouncer_rules.yaml +0 -0
  82. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/payloads/vm/prometheus_alert_rules/postgresql_rules.yaml +0 -0
  83. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/scripts/authorisation_rules_observer.py +0 -0
  84. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/scripts/cluster_topology_observer.py +0 -0
  85. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/scripts/rotate_logs.py +0 -0
  86. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/__init__.py +0 -0
  87. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/k8s/pgbackrest.conf.j2 +0 -0
  88. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/k8s/pgbackrest.logrotate.j2 +0 -0
  89. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/patroni.yml.j2 +0 -0
  90. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/vm/pgbackrest.conf.j2 +0 -0
  91. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/vm/pgbackrest.logrotate.j2 +0 -0
  92. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/vm/raft-observer.service.j2 +0 -0
  93. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/templates/vm/raft-observer.timer.j2 +0 -0
  94. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/__init__.py +0 -0
  95. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/arch.py +0 -0
  96. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/backup.py +0 -0
  97. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/filesystem.py +0 -0
  98. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/payloads.py +0 -0
  99. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/postgresql.py +0 -0
  100. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/s3.py +0 -0
  101. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/secret.py +0 -0
  102. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/status.py +0 -0
  103. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/utils/tracing.py +0 -0
  104. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/__init__.py +0 -0
  105. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/base.py +0 -0
  106. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/k8s.py +0 -0
  107. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/paths/__init__.py +0 -0
  108. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/paths/base.py +0 -0
  109. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/paths/k8s.py +0 -0
  110. {postgresql_charms_single_kernel-16.3.25 → postgresql_charms_single_kernel-16.3.26}/single_kernel_postgresql/workload/paths/vm.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: postgresql-charms-single-kernel
3
- Version: 16.3.25
3
+ Version: 16.3.26
4
4
  Summary: Shared and reusable code for PostgreSQL-related charms
5
5
  Author: Canonical Data Platform
6
6
  Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
@@ -230,7 +230,7 @@ Requires-Dist: boto3>=1.43.85 ; python_full_version >= '3.12' and extra == 'post
230
230
  Requires-Dist: botocore>=1.43.85 ; python_full_version >= '3.12' and extra == 'postgresql'
231
231
  Requires-Dist: pysyncobj>=0.3.15 ; python_full_version >= '3.12' and extra == 'vm'
232
232
  Requires-Dist: psutil>=7.2.2 ; python_full_version >= '3.12' and extra == 'vm'
233
- Requires-Dist: charmlibs-snap>=1.0.1,<2 ; python_full_version >= '3.12' and extra == 'vm'
233
+ Requires-Dist: charmlibs-snap>=2.0.0,<3 ; python_full_version >= '3.12' and extra == 'vm'
234
234
  Requires-Dist: charmlibs-systemd>=1.0.0.post0 ; python_full_version >= '3.12' and extra == 'vm'
235
235
  Requires-Dist: cosl>=0.0.53 ; python_full_version >= '3.12' and extra == 'vm'
236
236
  Requires-Python: >=3.8, <4.0
@@ -1,7 +1,7 @@
1
1
  [project]
2
2
  name = "postgresql-charms-single-kernel"
3
3
  description = "Shared and reusable code for PostgreSQL-related charms"
4
- version = "16.3.25"
4
+ version = "16.3.26"
5
5
  readme = "README.md"
6
6
  classifiers = [
7
7
  "Development Status :: 3 - Alpha",
@@ -38,7 +38,7 @@ postgresql = [
38
38
  vm = [
39
39
  "pysyncobj>=0.3.15; python_version >= '3.12'",
40
40
  "psutil>=7.2.2; python_version >= '3.12'",
41
- "charmlibs-snap>=1.0.1,<2; python_version >= '3.12'",
41
+ "charmlibs-snap>=2.0.0,<3; python_version >= '3.12'",
42
42
  "charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'",
43
43
  "cosl>=0.0.53; python_version >= '3.12'",
44
44
  ]
@@ -4,7 +4,7 @@
4
4
  [project]
5
5
  name = "postgresql-charms-single-kernel"
6
6
  description = "Shared and reusable code for PostgreSQL-related charms"
7
- version = "16.3.25"
7
+ version = "16.3.26"
8
8
  readme = "README.md"
9
9
  license = {file = "LICENSE"}
10
10
  authors = [
@@ -40,7 +40,7 @@ postgresql = [
40
40
  vm = [
41
41
  "pysyncobj>=0.3.15; python_version >= '3.12'",
42
42
  "psutil>=7.2.2; python_version >= '3.12'",
43
- "charmlibs-snap>=1.0.1,<2; python_version >= '3.12'",
43
+ "charmlibs-snap>=2.0.0,<3; python_version >= '3.12'",
44
44
  "charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'",
45
45
  "cosl>=0.0.53; python_version >= '3.12'",
46
46
  ]
@@ -10,6 +10,7 @@ from typing import TYPE_CHECKING, cast
10
10
  from data_platform_helpers.advanced_statuses import StatusHandler
11
11
  from ops import StatusBase
12
12
  from ops.charm import CharmBase, UpdateStatusEvent
13
+ from ops.log import JujuLogHandler
13
14
  from ops_tracing import Tracing
14
15
 
15
16
  if TYPE_CHECKING:
@@ -91,6 +92,12 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
91
92
  tls_transfer: "TLSTransfer"
92
93
 
93
94
  def __init__(self, *args):
95
+ # Show logger name (module name) in logs
96
+ root_logger = logging.getLogger()
97
+ for handler in root_logger.handlers:
98
+ if isinstance(handler, JujuLogHandler):
99
+ handler.setFormatter(logging.Formatter("{name}:{message}", style="{"))
100
+
94
101
  super().__init__(*args)
95
102
 
96
103
  # State
@@ -339,6 +346,8 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
339
346
  self.raft_manager,
340
347
  self.backup_manager,
341
348
  self.restore_manager,
349
+ self.observer_manager,
350
+ self.async_replication_manager,
342
351
  )
343
352
 
344
353
  # Rolling-restart manager (the rolling_ops charm lib is vendored in the
@@ -17,7 +17,6 @@ from lightkube import Client
17
17
  from lightkube.core.exceptions import ApiError
18
18
  from lightkube.resources.core_v1 import Endpoints
19
19
  from ops import ActiveStatus, BlockedStatus, ModelError, StatusBase
20
- from ops.log import JujuLogHandler
21
20
  from ops.pebble import ChangeError, Layer, LayerDict, ServiceDict, ServiceStatus
22
21
 
23
22
  from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
@@ -93,12 +92,6 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
93
92
  "Workload must be an instance of K8sWorkload"
94
93
  )
95
94
 
96
- # Show the logger name (module name) in logs (port).
97
- root_logger = logging.getLogger()
98
- for handler in root_logger.handlers:
99
- if isinstance(handler, JujuLogHandler):
100
- handler.setFormatter(logging.Formatter("{name}:{message}", style="{"))
101
-
102
95
  # Open the API and database ports when Juju supports it on K8s (port).
103
96
  if self.model.juju_version.supports_open_port_on_k8s:
104
97
  try:
@@ -17,7 +17,6 @@ from urllib.parse import urlparse
17
17
  import charm_refresh
18
18
  from charmlibs import snap
19
19
  from ops import ActiveStatus, BlockedStatus, StatusBase
20
- from ops.log import JujuLogHandler
21
20
  from tenacity import RetryError
22
21
 
23
22
  from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
@@ -50,6 +49,7 @@ from single_kernel_postgresql.utils.postgresql import (
50
49
  from single_kernel_postgresql.utils.postgresql import (
51
50
  PostgreSQL as PostgreSQLClient,
52
51
  )
52
+ from single_kernel_postgresql.utils.snap import service_states
53
53
  from single_kernel_postgresql.utils.tracing import charm_tracing_config
54
54
  from single_kernel_postgresql.workload.vm import VMWorkload
55
55
 
@@ -78,12 +78,6 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
78
78
  super().__init__(*args)
79
79
  self._charm_dir = pathlib.Path(os.environ.get("CHARM_DIR", "."))
80
80
 
81
- # Show the logger name (module name) in logs.
82
- root_logger = logging.getLogger()
83
- for handler in root_logger.handlers:
84
- if isinstance(handler, JujuLogHandler):
85
- handler.setFormatter(logging.Formatter("{name}:{message}", style="{"))
86
-
87
81
  # The lib TLS handler emits tls_files_pushed after a successful push;
88
82
  # the VM charm reloads (update_config) on it (port of _reload_tls_after_push).
89
83
  self.framework.observe(self.tls.tls_files_pushed, self._reload_tls_after_push)
@@ -240,86 +234,82 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
240
234
 
241
235
  def restart_services(self) -> None:
242
236
  """Restart the monitoring and LDAP sync snap services if needed (port)."""
243
- cache = snap.SnapCache()
244
- postgres_snap = cache[charm_refresh.snap_name()]
245
- self._restart_metrics_service(postgres_snap)
246
- self._restart_ldap_sync_service(postgres_snap)
237
+ snap_name = charm_refresh.snap_name()
238
+ self._restart_metrics_service(snap_name=snap_name)
239
+ self._restart_ldap_sync_service(snap_name=snap_name)
247
240
 
248
- def _restart_metrics_service(self, postgres_snap: snap.Snap) -> None:
241
+ def _restart_metrics_service(self, snap_name: str) -> None:
249
242
  """Restart the monitoring service if the password was rotated (port)."""
250
243
  try:
251
- snap_password = postgres_snap.get("exporter.password")
252
- except snap.SnapError:
244
+ snap_password = snap.get_one(snap_name, "exporter.password")
245
+ except snap.Error:
253
246
  logger.warning("Early exit: Trying to reset metrics service with no configuration set")
254
247
  return None
255
248
 
256
249
  if snap_password != self.state.get_secret(APP_SCOPE, MONITORING_PASSWORD_KEY):
257
- self._setup_exporter(postgres_snap)
250
+ self._setup_exporter(snap_name=snap_name)
258
251
 
259
- def _restart_ldap_sync_service(self, postgres_snap: snap.Snap) -> None:
252
+ def _restart_ldap_sync_service(self, snap_name: str) -> None:
260
253
  """Restart the LDAP sync service in case any configuration changed (port)."""
261
254
  if not self.patroni_manager.member_started:
262
255
  logger.debug("Restart LDAP sync early exit: Patroni has not started yet")
263
256
  return
264
257
 
265
- sync_service = postgres_snap.services["ldap-sync"]
258
+ sync_service = service_states(snap_name)["ldap-sync"]
266
259
 
267
- if not self.is_primary and sync_service["active"]:
260
+ if not self.is_primary and sync_service:
268
261
  logger.debug("Stopping LDAP sync service. It must only run in the primary")
269
- postgres_snap.stop(services=["ldap-sync"])
262
+ snap.stop(snap_name, services=["ldap-sync"])
270
263
 
271
264
  if self.is_primary and not self.is_ldap_enabled:
272
265
  logger.debug("Stopping LDAP sync service")
273
- postgres_snap.stop(services=["ldap-sync"])
266
+ snap.stop(snap_name, services=["ldap-sync"])
274
267
  return
275
268
 
276
269
  if self.is_primary and self.is_ldap_enabled:
277
- self._setup_ldap_sync(postgres_snap)
270
+ self._setup_ldap_sync(snap_name=snap_name)
278
271
 
279
- def _setup_exporter(self, postgres_snap: snap.Snap | None = None) -> None:
272
+ def _setup_exporter(self, snap_name: str | None = None) -> None:
280
273
  """Set up postgresql_exporter options (port)."""
281
- if postgres_snap is None:
282
- cache = snap.SnapCache()
283
- postgres_snap = cache[charm_refresh.snap_name()]
284
-
285
- postgres_snap.set({
274
+ config = {
286
275
  "exporter.user": "monitoring",
287
276
  "exporter.password": self.state.get_secret(APP_SCOPE, MONITORING_PASSWORD_KEY),
288
- })
277
+ }
278
+ if snap_name is None:
279
+ snap_name = charm_refresh.snap_name()
280
+ snap.set(snap_name, {key: str(value) for key, value in config.items()})
289
281
 
290
- if postgres_snap.services[VM_METRICS_SERVICE_NAME]["active"] is False:
291
- postgres_snap.start(services=[VM_METRICS_SERVICE_NAME], enable=True)
282
+ if service_states(snap_name)[VM_METRICS_SERVICE_NAME] is False:
283
+ snap.start(snap_name, services=[VM_METRICS_SERVICE_NAME], enable=True)
292
284
  else:
293
- postgres_snap.restart(services=[VM_METRICS_SERVICE_NAME])
285
+ snap.restart(snap_name, services=[VM_METRICS_SERVICE_NAME])
294
286
 
295
287
  self.state.peer.data.update({"exporter-started": "True"})
296
288
 
297
- def _setup_pgbackrest_exporter(self, postgres_snap: snap.Snap | None = None) -> None:
289
+ def _setup_pgbackrest_exporter(self, snap_name: str | None = None) -> None:
298
290
  """Set up pgbackrest_exporter (port)."""
299
- if postgres_snap is None:
300
- cache = snap.SnapCache()
301
- postgres_snap = cache[charm_refresh.snap_name()]
302
-
303
- if postgres_snap.services[VM_PGBACKREST_METRICS_SERVICE_NAME]["active"] is False:
304
- postgres_snap.start(services=[VM_PGBACKREST_METRICS_SERVICE_NAME], enable=True)
291
+ if snap_name is None:
292
+ snap_name = charm_refresh.snap_name()
293
+ if service_states(snap_name)[VM_PGBACKREST_METRICS_SERVICE_NAME] is False:
294
+ snap.start(
295
+ snap_name,
296
+ services=[VM_PGBACKREST_METRICS_SERVICE_NAME],
297
+ enable=True,
298
+ )
305
299
  else:
306
- postgres_snap.restart(services=[VM_PGBACKREST_METRICS_SERVICE_NAME])
300
+ snap.restart(snap_name, services=[VM_PGBACKREST_METRICS_SERVICE_NAME])
307
301
 
308
302
  self.state.peer.data.update({"pgbackrest-exporter-started": "True"})
309
303
 
310
- def _setup_ldap_sync(self, postgres_snap: snap.Snap | None = None) -> None:
304
+ def _setup_ldap_sync(self, snap_name: str | None = None) -> None:
311
305
  """Set up postgresql_ldap_sync options (port)."""
312
- if postgres_snap is None:
313
- cache = snap.SnapCache()
314
- postgres_snap = cache[charm_refresh.snap_name()]
315
-
316
306
  ldap_params = self.ldap.get_ldap_parameters()
317
307
  ldap_url = urlparse(ldap_params["ldapurl"])
318
308
  ldap_group_mappings = self.postgresql.build_postgresql_group_map(
319
309
  self.state.config.ldap_map
320
310
  )
321
311
 
322
- postgres_snap.set({
312
+ config = {
323
313
  "ldap-sync.ldap_host": ldap_url.hostname,
324
314
  "ldap-sync.ldap_port": ldap_url.port,
325
315
  "ldap-sync.ldap_base_dn": ldap_params["ldapbasedn"],
@@ -332,10 +322,13 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
332
322
  "ldap-sync.postgres_database": DATABASE_DEFAULT_NAME,
333
323
  "ldap-sync.postgres_username": USER,
334
324
  "ldap-sync.postgres_password": self._get_password,
335
- })
325
+ }
326
+ if snap_name is None:
327
+ snap_name = charm_refresh.snap_name()
328
+ snap.set(snap_name, {key: str(value) for key, value in config.items()})
336
329
 
337
330
  logger.debug("Starting LDAP sync service")
338
- postgres_snap.restart(services=["ldap-sync"])
331
+ snap.restart(snap_name, services=["ldap-sync"])
339
332
 
340
333
  def set_unit_status(
341
334
  self,
@@ -455,9 +448,10 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
455
448
 
456
449
  def post_refresh_side_effects(self) -> None:
457
450
  """Post-refresh workload side effects (port): exporters, pgbackrest, watcher."""
458
- self._setup_exporter()
451
+ snap_name = charm_refresh.snap_name()
452
+ self._setup_exporter(snap_name=snap_name)
459
453
  self.backup_manager.start_stop_pgbackrest_service()
460
- self._setup_pgbackrest_exporter()
454
+ self._setup_pgbackrest_exporter(snap_name=snap_name)
461
455
  self.watcher_handler.update_unit_address()
462
456
 
463
457
  def has_async_replication_relation(self) -> bool:
@@ -1202,7 +1202,7 @@ class PostgreSQLEventsHandler(Object):
1202
1202
  # Disable too, so a mid-teardown restart of the unit can't re-enable
1203
1203
  # the services and re-grab the storage mounts before Juju finishes
1204
1204
  # unmounting.
1205
- snap.SnapCache()[charm_refresh.snap_name()].stop(disable=True)
1205
+ snap.stop(charm_refresh.snap_name(), disable=True)
1206
1206
  except Exception:
1207
1207
  logger.exception("Failed to stop charmed-postgresql snap services")
1208
1208
 
@@ -1234,8 +1234,8 @@ class PostgreSQLEventsHandler(Object):
1234
1234
  )
1235
1235
  return
1236
1236
  try:
1237
- snap.SnapCache()[charm_refresh.snap_name()].ensure(snap.SnapState.Absent)
1238
- except (snap.SnapError, snap.SnapNotFoundError):
1237
+ snap.remove(charm_refresh.snap_name())
1238
+ except snap.Error:
1239
1239
  # Don't fail the hook: an error here would block the removal of the unit.
1240
1240
  logger.exception("Failed to remove charmed-postgresql snap")
1241
1241
 
@@ -22,6 +22,9 @@ from urllib.parse import urljoin
22
22
  with suppress(ImportError):
23
23
  from charmlibs import snap
24
24
  from charmlibs.systemd import daemon_reload
25
+
26
+ from single_kernel_postgresql.utils.snap import logs_by_identifier, service_states
27
+ import charm_refresh
25
28
  import psycopg2
26
29
  import psycopg2.extras
27
30
  import requests
@@ -597,11 +600,11 @@ class PatroniManager(BaseManager):
597
600
  """
598
601
  try:
599
602
  logger.debug("Getting Patroni logs...")
600
- cache = snap.SnapCache()
601
- selected_snap = cache["charmed-postgresql"]
602
- # Lib definition of num_lines only allows int
603
- return selected_snap.logs(services=["patroni"], num_lines=num_lines) # pyright: ignore
604
- except snap.SnapError as e:
603
+ limit = None if num_lines == "all" else num_lines
604
+ return logs_by_identifier(
605
+ "charmed-postgresql", "charmed-postgresql.patroni", limit=limit
606
+ )
607
+ except snap.Error as e:
605
608
  error_message = "Failed to get logs from patroni snap service"
606
609
  logger.exception(error_message, exc_info=e)
607
610
  return ""
@@ -634,12 +637,11 @@ class PatroniManager(BaseManager):
634
637
  """
635
638
  try:
636
639
  logger.debug("Stopping Patroni...")
637
- cache = snap.SnapCache()
638
- selected_snap = cache["charmed-postgresql"]
639
- selected_snap.stop(services=["patroni"])
640
+ snap_name = charm_refresh.snap_name()
641
+ snap.stop(snap_name, services=["patroni"])
640
642
  self._invalidate_cluster_status_cache()
641
- return not selected_snap.services["patroni"]["active"]
642
- except snap.SnapError as e:
643
+ return service_states(snap_name).get("patroni") is False
644
+ except snap.Error as e:
643
645
  error_message = "Failed to stop patroni snap service"
644
646
  logger.exception(error_message, exc_info=e)
645
647
  return False
@@ -796,12 +798,10 @@ class PatroniManager(BaseManager):
796
798
  """
797
799
  try:
798
800
  logger.debug("Restarting Patroni...")
799
- cache = snap.SnapCache()
800
- selected_snap = cache["charmed-postgresql"]
801
- selected_snap.restart(services=["patroni"])
801
+ snap.restart("charmed-postgresql", services=["patroni"])
802
802
  self._invalidate_cluster_status_cache()
803
- return selected_snap.services["patroni"]["active"]
804
- except snap.SnapError as e:
803
+ return service_states("charmed-postgresql").get("patroni", False)
804
+ except snap.Error as e:
805
805
  error_message = "Failed to start patroni snap service"
806
806
  logger.exception(error_message, exc_info=e)
807
807
  return False
@@ -299,9 +299,6 @@ class RefreshManager(BaseManager):
299
299
  self._charm = charm
300
300
  self.set_default_status = set_default_status
301
301
  self.can_set_app_status = True
302
- # The default (role) status as last computed by reconcile_refresh_status;
303
- # None until the first no-refresh reconciliation runs.
304
- self._default_status: StatusBase | None = None
305
302
  # charm_refresh resume callbacks (e.g. refresh_snap) run DURING the
306
303
  # charm_refresh.Machines()/Kubernetes() construction below and dispatch back
307
304
  # through this manager (refresh_snap ends with
@@ -352,7 +349,6 @@ class RefreshManager(BaseManager):
352
349
  )
353
350
  self.refresh = None
354
351
  self.reconcile_refresh_status()
355
- self._persist_machinery_status()
356
352
 
357
353
  def _construct_refresh_object(
358
354
  self,
@@ -385,81 +381,57 @@ class RefreshManager(BaseManager):
385
381
  ) -> list[StatusObject]:
386
382
  """Compute the manager's statuses.
387
383
 
388
- The refresh statuses are maintained statefully (see reconcile_refresh_status),
389
- so recompute replays the reconciliation and surfaces the resulting unit status
390
- as this manager's status record; the machinery record stays available to the
391
- status handler's collect evaluation between recomputes.
384
+ The refresh statuses are maintained statefully on the unit status itself (see
385
+ reconcile_refresh_status), so recompute replays the reconciliation. The unit
386
+ status record is never stored: it is derived from the live unit status on
387
+ every evaluation, so the status handler's collect always sees what the hook
388
+ last wrote (a stored snapshot replayed the pre-hook role and kept the
389
+ 'Primary' label on the old primary after a switchover).
392
390
  """
393
- if not recompute:
391
+ if recompute:
392
+ self.reconcile_refresh_status()
393
+ if scope == "app":
394
+ if recompute:
395
+ # App statuses stay charm-owned (the async-replication phase migrates
396
+ # them); the leader set-app-status call ran in the reconciliation.
397
+ return [GeneralStatuses.ACTIVE_IDLE.value]
394
398
  return self.state.statuses.get(scope, self.name).root or [
395
399
  GeneralStatuses.ACTIVE_IDLE.value
396
400
  ]
397
- self.reconcile_refresh_status()
398
- if scope == "app":
399
- # App statuses stay charm-owned (the async-replication phase migrates
400
- # them); the leader set-app-status call ran in the reconciliation.
401
- return [GeneralStatuses.ACTIVE_IDLE.value]
402
- return [self._persist_machinery_status()]
403
-
404
- def _persist_machinery_status(self) -> StatusObject:
405
- """Persist the reconciled unit status as this manager's status record.
406
-
407
- Only snapshot the unit status when the refresh itself set it: the
408
- reconciliation records the refresh status message in
409
- LAST_REFRESH_UNIT_STATUS_FILE, and a snapshot of an unrelated status
410
- would be re-fed through the collect handler forever (waiting outranks
411
- active there), self-perpetuating a stale status.
412
-
413
- One relaxation keeps the role surface visible: the charm's update-status
414
- handler writes the role message (Primary/Standby, with its degraded or
415
- read-only suffixes) as its last statement, so an ActiveStatus carrying a
416
- message is snapshotted even when the refresh did not set it. Active
417
- ranks self-clear — the next bare active() write fails the branch and
418
- resets the record. Blocked/maintenance/waiting statuses the refresh did
419
- not set keep the plain ACTIVE_IDLE fallback. A bare active() (no role
420
- information) is also not snapshotted: replaying it is indistinguishable
421
- from ACTIVE_IDLE.
401
+ return [self._machinery_status()]
402
+
403
+ def _machinery_status(self) -> StatusObject:
404
+ """Derive this manager's unit status record from the live unit status.
405
+
406
+ The status handler sets the unit status from the components' records alone,
407
+ so whatever this returns replaces the unit status at the end of the hook
408
+ unless another component reports a higher-priority status.
409
+
410
+ A status the refresh itself set (its message is recorded in
411
+ LAST_REFRESH_UNIT_STATUS_FILE) is passed through as is. Of the statuses the
412
+ refresh did not set, only an ActiveStatus carrying a message passes through:
413
+ that is the role surface (Primary/Standby, with its degraded or read-only
414
+ suffixes) written by set_primary_status_message. Blocked, maintenance and
415
+ waiting statuses the refresh did not set are owned by the components that
416
+ raise them and fall back to ACTIVE_IDLE here, as does a bare active().
422
417
  """
423
- if self.refresh is None:
424
- # Persist the freshly computed default (role) status so every hook's
425
- # collect replays it and the mid-hook role writes become idempotent
426
- # instead of being wiped to bare active().
427
- if isinstance(self._default_status, ActiveStatus):
428
- record = StatusObject(status="active", message=self._default_status.message)
429
- else:
430
- # Blocked/error defaults stay owned by the components that raise
431
- # them; snapshotting them here could self-perpetuate stale states.
432
- record = GeneralStatuses.ACTIVE_IDLE.value
433
- else:
418
+ status = self._charm.unit.status
419
+ if (
420
+ self.refresh is not None
421
+ and status.name in ("active", "blocked", "maintenance", "waiting")
422
+ and isinstance(status, (ActiveStatus, BlockedStatus, MaintenanceStatus, WaitingStatus))
423
+ ):
434
424
  try:
435
425
  refresh_status_message = json.loads(
436
426
  pathlib.Path(LAST_REFRESH_UNIT_STATUS_FILE).read_text()
437
427
  )
438
428
  except FileNotFoundError:
439
429
  refresh_status_message = None
440
- status = self._charm.unit.status
441
- if (
442
- status.name not in ("active", "blocked", "maintenance", "waiting")
443
- or not isinstance(
444
- status, (ActiveStatus, BlockedStatus, MaintenanceStatus, WaitingStatus)
445
- )
446
- or refresh_status_message != status.message
447
- ):
448
- if isinstance(status, ActiveStatus) and status.message:
449
- # The role message the charm just wrote must survive the
450
- # collect-phase recompute (roles-family '' != 'Primary'
451
- # after a fast self-heal, CI 2026-10-17).
452
- record = StatusObject(status="active", message=status.message)
453
- else:
454
- # Unknown/error statuses carry no refresh information, and
455
- # statuses the refresh did not set must not be snapshotted:
456
- # the record would never clear once the underlying condition
457
- # resolved.
458
- record = GeneralStatuses.ACTIVE_IDLE.value
459
- else:
460
- record = StatusObject(status=status.name, message=status.message)
461
- self.state.statuses.set(record, "unit", self.name)
462
- return record
430
+ if refresh_status_message == status.message:
431
+ return StatusObject(status=status.name, message=status.message)
432
+ if isinstance(status, ActiveStatus) and status.message:
433
+ return StatusObject(status="active", message=status.message)
434
+ return GeneralStatuses.ACTIVE_IDLE.value
463
435
 
464
436
  def set_unit_status(
465
437
  self,
@@ -512,7 +484,6 @@ class RefreshManager(BaseManager):
512
484
  # handler replays it instead of wiping the unit to bare active()
513
485
  # (primary-flap regression).
514
486
  self.set_default_status()
515
- self._default_status = self._charm.unit.status
516
487
  elif self._charm.unit.status.message == last_refresh_unit_status:
517
488
  if self.refresh is not None and (
518
489
  refresh_status := self.refresh.unit_status_lower_priority(
@@ -6,7 +6,6 @@
6
6
  from os import environ
7
7
  from subprocess import run
8
8
 
9
- from charmlibs.snap import SnapCache
10
9
  from pysyncobj.utility import TcpUtility
11
10
  from yaml import safe_load
12
11
 
@@ -17,6 +16,7 @@ from single_kernel_postgresql.config.literals import (
17
16
  RAFT_PORT,
18
17
  SNAP_DATA,
19
18
  )
19
+ from single_kernel_postgresql.utils.snap import service_states
20
20
 
21
21
  PATRONI_CONF_FILE_PATH = f"{BASE_SNAP_DIR}/{SNAP_DATA}/{PATRONI_CONF_PATH}/patroni.yaml"
22
22
 
@@ -75,7 +75,7 @@ def check_raft_connection(password: str) -> None:
75
75
 
76
76
  def main() -> None:
77
77
  """Main watch and dispatch."""
78
- if not SnapCache()["charmed-postgresql"].services["patroni"]["active"]:
78
+ if not service_states("charmed-postgresql").get("patroni", False):
79
79
  print("Patroni is not running")
80
80
  return
81
81
  if not (password := get_raft_password()):
@@ -0,0 +1,104 @@
1
+ # Copyright 2026 Canonical Ltd.
2
+ # See LICENSE file for licensing details.
3
+
4
+ """Snap service queries and identifier-filtered logs missing from charmlibs-snap."""
5
+
6
+ from __future__ import annotations
7
+
8
+ import httpx
9
+ from charmlibs import snap
10
+ from tenacity import Retrying, retry_if_exception, wait_fixed
11
+
12
+
13
+ def service_states(snap_name: str) -> dict[str, bool]: # noqa: C901
14
+ """Return declared services and their active states from snapd.
15
+
16
+ A missing snap raises ``snap.NotInstalledError``; an installed snap without
17
+ services returns an empty mapping. Query failures raise public ``snap.Error``
18
+ subclasses, never an empty result that could be mistaken for absence.
19
+ """
20
+ with httpx.Client(
21
+ transport=httpx.HTTPTransport(uds="/run/snapd.socket"), timeout=120
22
+ ) as client:
23
+ for attempt in Retrying(
24
+ # Match charmlibs-snap 2: a failure at exactly five seconds still retries.
25
+ stop=lambda state: (state.seconds_since_start or 0) > 5,
26
+ wait=wait_fixed(0.25),
27
+ retry=retry_if_exception(
28
+ lambda error: (
29
+ isinstance(error, snap.ConnectionError)
30
+ and not isinstance(error, snap.SocketNotFoundError)
31
+ )
32
+ ),
33
+ reraise=True,
34
+ ):
35
+ with attempt:
36
+ try:
37
+ response = client.get(
38
+ "http://localhost/v2/apps",
39
+ params={"names": snap_name, "select": "service"},
40
+ )
41
+ except httpx.TimeoutException as exc:
42
+ raise snap.TimeoutError(str(exc)) from exc
43
+ except httpx.TransportError as exc:
44
+ cause: BaseException | None = exc
45
+ while cause is not None:
46
+ if isinstance(cause, FileNotFoundError):
47
+ raise snap.SocketNotFoundError(str(exc)) from exc
48
+ cause = cause.__cause__ or cause.__context__
49
+ raise snap.ConnectionError(str(exc)) from exc
50
+ try:
51
+ body = response.json()
52
+ if body["type"] == "error":
53
+ result = body["result"]
54
+ if not isinstance(result, dict):
55
+ raise ValueError("Expected an error object")
56
+ error = (
57
+ snap.NotInstalledError if result.get("kind") == "snap-not-found" else snap.APIError
58
+ )
59
+ raise error(
60
+ result["message"],
61
+ kind=result.get("kind", ""),
62
+ value=result.get("value"),
63
+ status_code=response.status_code,
64
+ status=body.get("status"),
65
+ )
66
+ if (
67
+ not response.is_success
68
+ or body["type"] != "sync"
69
+ or not isinstance(body["result"], list)
70
+ ):
71
+ raise ValueError("Expected a synchronous service list")
72
+ states = {}
73
+ for service in body["result"]:
74
+ name, active = service["name"], service.get("active", False)
75
+ if not isinstance(name, str) or not name or not isinstance(active, bool):
76
+ raise ValueError("Invalid service name or active state")
77
+ states[name] = active
78
+ return states
79
+ except (ValueError, KeyError, TypeError) as exc:
80
+ raise snap.BadResponseError(
81
+ "Invalid snapd service response", response=response.text
82
+ ) from exc
83
+
84
+
85
+ def _format_log(entry: snap.LogEntry) -> str:
86
+ """Match v1's local timestamp and line layout for persisted restore IDs."""
87
+ timestamp = entry.timestamp.astimezone().isoformat(timespec="seconds")
88
+ if timestamp.endswith("+00:00"):
89
+ timestamp = timestamp[:-6] + "Z"
90
+ return f"{timestamp} {entry.sid}[{entry.pid}]: {entry.message}\n"
91
+
92
+
93
+ def logs_by_identifier(snap_name: str, identifier: str, *, limit: int | None = None) -> str:
94
+ """Filter all snap logs by exact SID, then apply the line limit.
95
+
96
+ Entries retain chronological order and v1 formatting. Snap query errors
97
+ propagate to the caller. Negative limits raise ``snap.Error``, like v1's CLI.
98
+ """
99
+ if limit is not None and limit < 0:
100
+ raise snap.Error("Log limit must be non-negative")
101
+ entries = [entry for entry in snap.logs(snap_name, limit=None) if entry.sid == identifier]
102
+ if limit is not None:
103
+ entries = entries[-limit:] if limit else []
104
+ return "".join(_format_log(entry) for entry in entries)