fix logging in DataSource modules

Previous logging was getting 'None' set in the DataSource collections.
Thus, 'log.debug' would throw error.  I think it is proper to pull in
the base cloudinit's log.
This commit is contained in:
Scott Moser 2011-02-04 16:56:17 -05:00
parent 68f75fa851
commit 452e9688d3
5 changed files with 3 additions and 15 deletions

View File

@ -22,15 +22,6 @@ DEP_NETWORK = "NETWORK"
import UserDataHandler as ud import UserDataHandler as ud
log = None
def setlog(log_in=None, name="DataSource"):
log = log_in
if log is None:
class NullHandler(logging.Handler):
def emit(self,record): pass
log = logging.getLogger(name)
log.addHandler(NullHandler())
class DataSource: class DataSource:
userdata = None userdata = None
metadata = None metadata = None

View File

@ -17,9 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import DataSource import DataSource
log = DataSource.log
from cloudinit import seeddir from cloudinit import seeddir, log
import cloudinit.util as util import cloudinit.util as util
import socket import socket
import urllib2 import urllib2

View File

@ -17,9 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import DataSource import DataSource
log = DataSource.log
from cloudinit import seeddir from cloudinit import seeddir, log
import cloudinit.util as util import cloudinit.util as util
import sys import sys
import os.path import os.path

View File

@ -18,7 +18,7 @@
import DataSource import DataSource
from cloudinit import seeddir from cloudinit import seeddir, log
import cloudinit.util as util import cloudinit.util as util
import sys import sys
import os.path import os.path

View File

@ -102,7 +102,6 @@ def logging_set_from_cfg(cfg):
import DataSource import DataSource
DataSource.setlog(log)
import UserDataHandler import UserDataHandler
class CloudInit: class CloudInit: