From d54af2c1734f5d7e17cc18f31515ec96de5f98c6 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Fri, 26 Apr 2013 17:53:58 +0100 Subject: Rename printing plug-in and add check for cups package The 'printing' plug-in is almost entirely cups-specific (the lpstat invocations would work with another lp implementation but that's fairly unlikely..). Add a check for the package and rename the module to cups.py. Signed-off-by: Bryn M. Reeves --- sos/plugins/cups.py | 36 ++++++++++++++++++++++++++++++++++++ sos/plugins/printing.py | 34 ---------------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 sos/plugins/cups.py delete mode 100644 sos/plugins/printing.py diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py new file mode 100644 index 00000000..aaa3971e --- /dev/null +++ b/sos/plugins/cups.py @@ -0,0 +1,36 @@ +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin + +class Printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): + """printing related information (cups) + """ + + plugin_name = 'printing' + + packages = ('cups',) + option_list = [("cups", "max size (MiB) to collect per cups log file", + "", 15)] + + def setup(self): + self.add_copy_specs([ + "/etc/cups/*.conf", + "/etc/cups/lpoptions", + "/etc/cups/ppd/*.ppd"]) + self.add_copy_spec_limit("/var/log/cups", + sizelimit=self.option_enabled("cupslogsize")) + self.add_cmd_output("lpstat -t") + self.add_cmd_output("lpstat -s") + self.add_cmd_output("lpstat -d") diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py deleted file mode 100644 index 30161fc9..00000000 --- a/sos/plugins/printing.py +++ /dev/null @@ -1,34 +0,0 @@ -### This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. - -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. - -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin - -class Printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): - """printing related information (cups) - """ - - plugin_name = 'printing' - - option_list = [("cups", "max size (MiB) to collect per cups log file", - "", 15)] - - def setup(self): - self.add_copy_specs([ - "/etc/cups/*.conf", - "/etc/cups/lpoptions", - "/etc/cups/ppd/*.ppd"]) - self.add_copy_spec_limit("/var/log/cups", sizelimit=self.option_enabled("cupslogsize")) - self.add_cmd_output("lpstat -t") - self.add_cmd_output("lpstat -s") - self.add_cmd_output("lpstat -d") -- cgit