Skip to content

Commit

Permalink
The RRD helper doesn't need a reload command anymore
Browse files Browse the repository at this point in the history
Change-Id: Iba65886c10f025b13481841ce02d0e9ad6713491
  • Loading branch information
spt29 committed Feb 28, 2025
1 parent 56d49ba commit 72b6ac3
Showing 1 changed file with 15 additions and 20 deletions.
35 changes: 15 additions & 20 deletions cmk/rrd/rrd.py
Original file line number Diff line number Diff line change
Expand Up @@ -774,26 +774,21 @@ def _write_rrd_helper_response(self) -> None:
self._rrd_helper_output_buffer = self._rrd_helper_output_buffer[written:]

def _handle_job(self, spec: str, config_class: type[RRDConfig]) -> None:
if spec == "*":
# Obsolete. We can't reload the config explicitly, as this is done already
# by core config generation.
console.verbose("Reloading configuration.")
else:
parsed_spec = RRDSpec.parse(spec)
config = config_class(parsed_spec.host)
try:
self._create_rrd_from_spec(config, parsed_spec)
except self._rrd_interface.OperationalError as exc:
self._queue_rrd_helper_response(f"Error creating RRD: {exc!s}")
except OSError as exc:
self._queue_rrd_helper_response(f"Error creating RRD: {exc.strerror}")
except Exception as e:
if cmk.ccc.debug.enabled():
raise
create_crash_report()
self._queue_rrd_helper_response(
f"Error creating RRD for {spec}: {str(e) or traceback.format_exc()}"
)
parsed_spec = RRDSpec.parse(spec)
config = config_class(parsed_spec.host)
try:
self._create_rrd_from_spec(config, parsed_spec)
except self._rrd_interface.OperationalError as exc:
self._queue_rrd_helper_response(f"Error creating RRD: {exc!s}")
except OSError as exc:
self._queue_rrd_helper_response(f"Error creating RRD: {exc.strerror}")
except Exception as e:
if cmk.ccc.debug.enabled():
raise
create_crash_report()
self._queue_rrd_helper_response(
f"Error creating RRD for {spec}: {str(e) or traceback.format_exc()}"
)

def _create_rrd_from_spec(self, config: RRDConfig, spec: RRDSpec) -> None:
rrd_file_name = _create_rrd(
Expand Down

0 comments on commit 72b6ac3

Please sign in to comment.