unified [Single]XMLFileBacked, enabled xinclude pretty much everywhere

1 files changed, 4 insertions, 13 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
index 4e8b09f30..f2b8336e0 100644
--- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
+++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
@@ -14,25 +14,16 @@ LOGGER = logging.getLogger('Bcfg2.Plugins.NagiosGen')
 
 line_fmt = '\t%-32s %s'
 
-class NagiosGenConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked,
-                      Bcfg2.Server.Plugin.StructFile):
+class NagiosGenConfig(Bcfg2.Server.Plugin.StructFile):
     def __init__(self, filename, fam):
         # create config.xml if missing
         if not os.path.exists(filename):
             LOGGER.warning("NagiosGen: %s missing. "
                            "Creating empty one for you." % filename)
-            f = open(filename, "w")
-            f.write("<NagiosGen></NagiosGen>")
-            f.close()
+            open(filename, "w").write("<NagiosGen></NagiosGen>")
 
-        try:
-            Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self,
-                                                             filename,
-                                                             fam)
-        except OSError:
-            LOGGER.error("NagiosGen: Failed to read configuration file: %s" % err)
-            raise Bcfg2.Server.Plugin.PluginInitError(msg)
-        Bcfg2.Server.Plugin.StructFile.__init__(self, filename)
+        Bcfg2.Server.Plugin.StructFile.__init__(self, filename, fam=fam,
+                                                should_monitor=True)
 
 
 class NagiosGen(Bcfg2.Server.Plugin.Plugin,