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:
parent
68f75fa851
commit
452e9688d3
@ -22,15 +22,6 @@ DEP_NETWORK = "NETWORK"
|
||||
|
||||
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:
|
||||
userdata = None
|
||||
metadata = None
|
||||
|
@ -17,9 +17,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import DataSource
|
||||
log = DataSource.log
|
||||
|
||||
from cloudinit import seeddir
|
||||
from cloudinit import seeddir, log
|
||||
import cloudinit.util as util
|
||||
import socket
|
||||
import urllib2
|
||||
|
@ -17,9 +17,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import DataSource
|
||||
log = DataSource.log
|
||||
|
||||
from cloudinit import seeddir
|
||||
from cloudinit import seeddir, log
|
||||
import cloudinit.util as util
|
||||
import sys
|
||||
import os.path
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
import DataSource
|
||||
|
||||
from cloudinit import seeddir
|
||||
from cloudinit import seeddir, log
|
||||
import cloudinit.util as util
|
||||
import sys
|
||||
import os.path
|
||||
|
@ -102,7 +102,6 @@ def logging_set_from_cfg(cfg):
|
||||
|
||||
|
||||
import DataSource
|
||||
DataSource.setlog(log)
|
||||
import UserDataHandler
|
||||
|
||||
class CloudInit:
|
||||
|
Loading…
x
Reference in New Issue
Block a user