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

Jump to bottom

[hostcfgd] Handle Both Service And Timer Units #5228

Merged
merged 2 commits into from
Aug 21, 2020
Merged

[hostcfgd] Handle Both Service And Timer Units #5228

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f661533
[hostcfgd] Handle Both Service And Timer Units
tahmed-dev Aug 20, 2020
e5c2f70
review comment
tahmed-dev Aug 21, 2020
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
23 changes: 13 additions & 10 deletions files/image_config/hostcfgd/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ def obfuscate(data):


def update_feature_state(feature_name, state, has_timer=False):
feature_suffix = "timer" if has_timer else "service"
feature_suffixes = ["service"] + (["timer"] if has_timer else [])
if state == "enabled":
start_cmds = []
start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, feature_suffix))
start_cmds.append("sudo systemctl enable {}.{}".format(feature_name, feature_suffix))
start_cmds.append("sudo systemctl start {}.{}".format(feature_name, feature_suffix))
for suffix in feature_suffixes:
start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, suffix))
start_cmds.append("sudo systemctl enable {}.{}".format(feature_name, suffix))
start_cmds.append("sudo systemctl start {}.{}".format(feature_name, feature_suffixes[-1]))
jleveque marked this conversation as resolved.
Show resolved Hide resolved
for cmd in start_cmds:
syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
try:
Expand All @@ -56,12 +57,14 @@ def update_feature_state(feature_name, state, has_timer=False):
syslog.syslog(syslog.LOG_ERR, "'{}' failed. RC: {}, output: {}"
.format(err.cmd, err.returncode, err.output))
continue
syslog.syslog(syslog.LOG_INFO, "Feature '{}.{}' is enabled and started".format(feature_name, feature_suffix))
syslog.syslog(syslog.LOG_INFO, "Feature '{}.{}' is enabled and started"
.format(feature_name, feature_suffixes[-1]))
elif state == "disabled":
stop_cmds = []
stop_cmds.append("sudo systemctl stop {}.{}".format(feature_name, feature_suffix))
stop_cmds.append("sudo systemctl disable {}.{}".format(feature_name, feature_suffix))
stop_cmds.append("sudo systemctl mask {}.{}".format(feature_name, feature_suffix))
for suffix in reversed(feature_suffixes):
stop_cmds.append("sudo systemctl stop {}.{}".format(feature_name, suffix))
stop_cmds.append("sudo systemctl disable {}.{}".format(feature_name, suffix))
stop_cmds.append("sudo systemctl mask {}.{}".format(feature_name, suffix))
for cmd in stop_cmds:
syslog.syslog(syslog.LOG_INFO, "Running cmd: '{}'".format(cmd))
try:
Expand All @@ -72,8 +75,8 @@ def update_feature_state(feature_name, state, has_timer=False):
continue
syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(feature_name))
else:
syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature '{}.{}'"
.format(state, feature_name, feature_suffix))
syslog.syslog(syslog.LOG_ERR, "Unexpected state value '{}' for feature '{}'"
.format(state, feature_name))


class Iptables(object):
Expand Down