Skip to content

Commit a41052b

Browse files
No logical code changes; Name changes only, per review comments
1 parent 9abb300 commit a41052b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

generic_config_updater/change_applier.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ def set_verbose(verbose=False):
2424
logger.set_min_log_priority_notice()
2525

2626

27-
def _log_debug(m):
27+
def log_debug(m):
2828
logger.log(logger.LOG_PRIORITY_DEBUG, m, print_to_console)
2929

3030

31-
def _log_error(m):
31+
def log_error(m):
3232
logger.log(logger.LOG_PRIORITY_ERROR, m, print_to_console)
3333

3434

@@ -98,9 +98,9 @@ def _services_validate(self, old_cfg, upd_cfg, keys):
9898
for cmd in lst_cmds:
9999
ret = self._invoke_cmd(cmd, old_cfg, upd_cfg, keys)
100100
if ret:
101-
_log_error("service invoked: {} failed with ret={}".format(cmd, ret))
101+
log_error("service invoked: {} failed with ret={}".format(cmd, ret))
102102
return ret
103-
_log_debug("service invoked: {}".format(cmd))
103+
log_debug("service invoked: {}".format(cmd))
104104
return 0
105105

106106

@@ -112,11 +112,11 @@ def _upd_data(self, tbl, run_tbl, upd_tbl, upd_keys):
112112
if run_data != upd_data:
113113
set_config(self.config_db, tbl, key, upd_data)
114114
upd_keys[tbl][key] = {}
115-
_log_debug("Patch affected tbl={} key={}".format(tbl, key))
115+
log_debug("Patch affected tbl={} key={}".format(tbl, key))
116116

117117

118118
def _report_mismatch(self, run_data, upd_data):
119-
_log_error("run_data vs expected_data: {}".format(
119+
log_error("run_data vs expected_data: {}".format(
120120
str(jsondiff.diff(run_data, upd_data))[0:40]))
121121

122122

@@ -136,7 +136,7 @@ def apply(self, change):
136136
self._report_mismatch(run_data, upd_data)
137137
ret = -1
138138
if ret:
139-
_log_error("Failed to apply Json change")
139+
log_error("Failed to apply Json change")
140140
return ret
141141

142142

generic_config_updater/generic_config_updater.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"validate_commands": [ ]
5353
},
5454
"rsyslog": {
55-
"validate_commands": [ "generic_config_updater.services_validator.ryslog_validator" ]
55+
"validate_commands": [ "generic_config_updater.services_validator.rsyslog_validator" ]
5656
},
5757
"dhcp-relay": {
5858
"validate_commands": [ "generic_config_updater.services_validator.dhcp_validator" ]

generic_config_updater/services_validator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def _service_restart(svc_name):
2222
return rc == 0
2323

2424

25-
def ryslog_validator(old_config, upd_config, keys):
25+
def rsyslog_validator(old_config, upd_config, keys):
2626
return _service_restart("rsyslog-config")
2727

2828

0 commit comments

Comments
 (0)