summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-09 15:40:20 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-09 15:40:20 -0500
commit872122afdb45e8198ef192babf1864a2da1ab021 (patch)
treec645ecbe3f888559fec66dd833a72b8d65f694a0
parentd363d516b4781d1a092cf4e8aafd8fa9295c7b47 (diff)
downloadbcfg2-872122afdb45e8198ef192babf1864a2da1ab021.tar.gz
bcfg2-872122afdb45e8198ef192babf1864a2da1ab021.tar.bz2
bcfg2-872122afdb45e8198ef192babf1864a2da1ab021.zip
fixed logging in GroupPatterns
-rw-r--r--src/lib/Server/Plugin.py2
-rw-r--r--src/lib/Server/Plugins/GroupPatterns.py6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 671a517dd..61e6d273d 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -356,8 +356,6 @@ class FileBacked(object):
object.__init__(self)
self.data = ''
self.name = name
- self.logger = logging.getLogger('Bcfg2.Plugins.%s' %
- self.__class__.__name__)
def HandleEvent(self, event=None):
"""Read file upon update."""
diff --git a/src/lib/Server/Plugins/GroupPatterns.py b/src/lib/Server/Plugins/GroupPatterns.py
index 7733f409f..58b4d4afb 100644
--- a/src/lib/Server/Plugins/GroupPatterns.py
+++ b/src/lib/Server/Plugins/GroupPatterns.py
@@ -1,9 +1,8 @@
-import lxml.etree
import re
-
+import logging
+import lxml.etree
import Bcfg2.Server.Plugin
-
class PackedDigitRange(object):
def __init__(self, digit_range):
self.sparse = list()
@@ -78,6 +77,7 @@ class PatternFile(Bcfg2.Server.Plugin.SingleXMLFileBacked):
def __init__(self, filename, fam):
Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, filename, fam)
self.patterns = []
+ self.logger = logging.getLogger(self.__class__.__name__)
def Index(self):
Bcfg2.Server.Plugin.SingleXMLFileBacked.Index(self)