summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 13:37:23 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 13:37:41 -0400
commit689c1519ced43315a4d8c78128c517743d772dce (patch)
treeed6441be694485070be708acd579f29b3264c0ea
parentbf8becbdcaae2c9f7b09925ecd9547fd3f6a72fe (diff)
downloadbcfg2-689c1519ced43315a4d8c78128c517743d772dce.tar.gz
bcfg2-689c1519ced43315a4d8c78128c517743d772dce.tar.bz2
bcfg2-689c1519ced43315a4d8c78128c517743d772dce.zip
more consistent XML-RPC debug calls for FAM
-rw-r--r--doc/help/troubleshooting.txt4
-rw-r--r--src/lib/Bcfg2/Server/Core.py14
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 35c1e93a2..aac831ae0 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -56,8 +56,8 @@ the debug level individually on a given plugin, e.g.::
Finally, the File Activity Monitor has its own analogue to these two
methods, for setting the debug level of the FAM:
- bcfg2-admin xcmd toggle_fam_debug
- bcfg2-admin xcmd set_fam_debug false
+ bcfg2-admin xcmd Inotify.toggle_debug
+ bcfg2-admin xcmd Inotify.set_debug false
Check if all repository XML files conform to schemas
====================================================
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 96100dae4..ee1006d1a 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -1137,12 +1137,15 @@ class BaseCore(object):
return self.toggle_fam_debug(address)
@exposed
- def toggle_fam_debug(self, _):
+ def toggle_fam_debug(self, address):
""" Toggle debug status of the FAM
:returns: bool - The new debug state of the FAM
"""
- return self.fam.toggle_debug()
+ self.logger.warning("Deprecated method set_fam_debug called by %s" %
+ address[0])
+ return "This method is deprecated and will be removed in a future " + \
+ "release\n%s" % self.fam.toggle_debug()
@exposed
def set_debug(self, address, debug):
@@ -1161,7 +1164,7 @@ class BaseCore(object):
return self.set_fam_debug(address, debug)
@exposed
- def set_fam_debug(self, _, debug):
+ def set_fam_debug(self, address, debug):
""" Explicitly set debug status of the FAM
:param debug: The new debug status of the FAM. This can
@@ -1173,4 +1176,7 @@ class BaseCore(object):
"""
if debug not in [True, False]:
debug = debug.lower() == "true"
- return self.fam.set_debug(debug)
+ self.logger.warning("Deprecated method set_fam_debug called by %s" %
+ address[0])
+ return "This method is deprecated and will be removed in a future " + \
+ "release\n%s" % self.fam.set_debug(debug)