Custom Query (894 matches)

In special setups (like ours) the bcfg2-client has to bind its client socket to a given IP address. The given patch enables this by integrating a new config-option

[communication]
bindaddress = 1.2.3.4

If this option is present, a new transport Bcfg2SafeTransport is used instead of xmlrpclib.SafeTransport? to finally include the socket.bind() method into connection setup.

bcfg2 with Gamin.

When using Cfg with probes, I created a directory repo/Probes/ where I put all my probe files.

Gamin adds the directory repo/Probes to the probes to be executed on the client.

The bcfg2 client will fail with the followjng message:

GetProbes completed successfully
Failed to execute probe: /home/gogo/subversion/svn-mj/trunk/bcfg2-repository/Probes
Traceback (most recent call last):
  File "/usr/sbin/bcfg2", line 95, in run_probe
    script.write(probe.text)
TypeError: argument 1 must be string or read-only character buffer, not None
Failed to Execute probes

Also if another directory under repo/Probes/ gets created, the error will appear since probe.text is None.

Currently only the last executed probe will be saved and available for host interpolation.

Possible fix:

Index: Cfg.py
===================================================================
--- Cfg.py      (Revision 2451)
+++ Cfg.py      (Arbeitskopie)
@@ -215,7 +215,8 @@
         if self.interpolate:
             if metadata.hostname in probeData:
                 for name, value in probeData[metadata.hostname].iteritems():
-                    filedata = filedata.replace("@@%[email protected]@"%name, value )
+                  if value != None:
+                    filedata = filedata.replace("@@%[email protected]@" % name, value )
             else:
                 logger.warning("Cannot interpolate data for client: %s for config file: %s"% (metadata.hostname, basefile.name))
         if self.paranoid:
@@ -277,7 +278,10 @@

     def ReceiveData(self, client, data):
         '''Receive probe results pertaining to client'''
-        probeData[client.hostname] = { data.get('name'):data.text }
+        try:
+            probeData[client.hostname].update({ data.get('name'):data.text })
+        except KeyError:
+            probeData[client.hostname] = { data.get('name'):data.text }

     def AddDirectoryMonitor(self, name):
         '''Add new directory to FAM structures'''