Skip to content

Commit

Permalink
[dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled (#…
Browse files Browse the repository at this point in the history
…19673)

* [dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled

* set include_dhcp_server to y

* Update log

* Revert "set include_dhcp_server to y"

This reverts commit 985273e.
  • Loading branch information
yaqiangz authored Jul 25, 2024
1 parent 762a9bf commit d9e6ab7
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ def refresh_dhcrelay(self, force_kill=False):
self._disable_checkers(checkers_to_be_disabled)

self._start_dhcrelay_process(dhcp_interfaces, dhcp_server_ip, force_kill)
self._start_dhcpmon_process(dhcp_interfaces, force_kill)

# TODO dhcpmon is not ready for count packet for dhcp_server, hence comment invoke it for now
# self._start_dhcpmon_process(dhcp_interfaces, force_kill)

def wait(self):
"""
Expand Down Expand Up @@ -307,7 +309,7 @@ def _start_dhcpmon_process(self, new_dhcp_interfaces, force_kill):
for pid, cmds in pids_cmds.items():
proc = psutil.Process(pid)
if proc.status() == psutil.STATUS_ZOMBIE:
syslog.syslog(syslog.LOG_ERR, "Faild to start dhcpmon process: {}".format(cmds))
syslog.syslog(syslog.LOG_ERR, "Failed to start dhcpmon process: {}".format(cmds))
terminate_proc(proc)
else:
syslog.syslog(syslog.LOG_INFO, "dhcpmon process started successfully, cmds: {}".format(cmds))
Expand Down

0 comments on commit d9e6ab7

Please sign in to comment.