summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Probes.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-29 08:50:50 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-29 08:57:14 -0400
commit0d7e708d7a75d0aaa9e2ff56ee6445a07998f6fe (patch)
treed166d4f5492273842772474e19f85ec3e5b06b21 /src/lib/Bcfg2/Server/Plugins/Probes.py
parentf60ab7ec8a1d5d090c272887d777d4635f95df49 (diff)
downloadbcfg2-0d7e708d7a75d0aaa9e2ff56ee6445a07998f6fe.tar.gz
bcfg2-0d7e708d7a75d0aaa9e2ff56ee6445a07998f6fe.tar.bz2
bcfg2-0d7e708d7a75d0aaa9e2ff56ee6445a07998f6fe.zip
added database locking to Metadata
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Probes.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 78dd2af85..941bc4fd8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -218,7 +218,7 @@ class Probes(Bcfg2.Server.Plugin.Probing,
err = sys.exc_info()[1]
self.logger.error("Failed to write probed.xml: %s" % err)
- @Bcfg2.Server.Plugin.DatabaseBacked._db_writer
+ @Bcfg2.Server.Plugin.DatabaseBacked.get_db_lock
def _write_data_db(self, client):
""" Write received probe data to the database """
for probe, data in self.probedata[client.hostname].items():
@@ -320,7 +320,7 @@ class Probes(Bcfg2.Server.Plugin.Probing,
cprobedata[data.get('name')] = ProbeData('')
return
dlines = data.text.split('\n')
- self.logger.debug("%s:probe:%s:%s" %
+ self.logger.debug("Processing probe from %s: %s:%s" %
(client.hostname, data.get('name'),
[line.strip() for line in dlines]))
for line in dlines[:]: