Permalink
Browse files

fixed some errors related to logging changes

  • Loading branch information...
1 parent bd0af63 commit 08d0190bb0d4828d42131a9621abdf2337878416 Michael Meisinger committed Jun 8, 2010
Showing with 7 additions and 2 deletions.
  1. +1 −0 README.txt
  2. +4 −1 ion/services/dm/fetcher.py
  3. +2 −1 ion/services/dm/test/test_datapubsub.py
View
@@ -127,6 +127,7 @@ Change log:
- Added possibility to modify logging levels by module/package, with support
for package hierarchy. See res/logging/loglevels.cfg for standard entries.
Do not modify. Add file res/logging/loglevelslocal.cfg for local override.
+ Default logging level for all ion code: WARNING
2010-06-02:
- BaseProcess self members renamed to conform to PEP8
- Added process shutdown to BaseProcess
@@ -17,7 +17,10 @@
import httplib as http
from socket import gaierror
import urlparse
-import simplejson as json
+try:
+ import json
+except:
+ import simplejson as json
from ion.core.base_process import ProtocolFactory
from ion.services.base_service import BaseService, BaseServiceClient
@@ -7,7 +7,8 @@
"""
import logging
-logging = logging.getLogger(__name__), time
+logging = logging.getLogger(__name__)
+import time
from twisted.internet import defer
from twisted.trial import unittest
from magnet.container import Container

0 comments on commit 08d0190

Please sign in to comment.