switched to making use of logzero for logging, provides nicer color output, and an easier path to switch to rotating log files

daemon/core/emane/__init__.py

@@ -1,10 +1,8 @@
 import subprocess
 
-from core.misc import log
+from core import logger
 from core.misc import utils
 
-logger = log.get_logger(__name__)
-
 EMANEUNK = 0
 EMANE074 = 7
 EMANE081 = 8

daemon/core/emane/commeffect.py

@@ -3,11 +3,9 @@ commeffect.py: EMANE CommEffect model for CORE
 """
 
 from core import emane
+from core import logger
 from core.emane.emanemodel import EmaneModel
 from core.enumerations import ConfigDataTypes
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 try:
     import emaneeventservice

daemon/core/emane/emanemanager.py

@@ -9,6 +9,7 @@ from xml.dom.minidom import parseString
 
 from core import constants
 from core import emane
+from core import logger
 from core.api import coreapi
 from core.conf import ConfigurableManager
 from core.emane.bypass import EmaneBypassModel
@@ -23,14 +24,11 @@ from core.enumerations import ConfigTlvs
 from core.enumerations import MessageFlags
 from core.enumerations import MessageTypes
 from core.enumerations import RegisterTlvs
-from core.misc import log
 from core.misc import nodeutils
 from core.misc import utils
 from core.misc.ipaddress import MacAddress
 from core.xml import xmlutils
 
-logger = log.get_logger(__name__)
-
 # EMANE 0.7.4/0.8.1
 try:
     import emaneeventservice

daemon/core/emane/emanemodel.py

@@ -3,13 +3,11 @@ Defines Emane Models used within CORE.
 """
 
 from core import emane
-from core.misc import log
+from core import logger
 from core.misc import utils
 from core.mobility import WirelessModel
 from core.xml import xmlutils
 
-logger = log.get_logger(__name__)
-
 
 class EmaneModel(WirelessModel):
     """

daemon/core/emane/ieee80211abg.py

@@ -6,9 +6,6 @@ from core import emane
 from core.emane.emanemodel import EmaneModel
 from core.emane.universal import EmaneUniversalModel
 from core.enumerations import ConfigDataTypes
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 
 class EmaneIeee80211abgModel(EmaneModel):

daemon/core/emane/nodes.py

@@ -7,13 +7,11 @@ share the same MAC+PHY model.
 from os import path
 
 from core import emane
+from core import logger
 from core.coreobj import PyCoreNet
 from core.enumerations import LinkTypes
 from core.enumerations import NodeTypes
 from core.enumerations import RegisterTlvs
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 try:
     from emanesh.events import LocationEvent

daemon/core/emane/rfpipe.py

@@ -6,9 +6,6 @@ from core import emane
 from core.emane.emanemodel import EmaneModel
 from core.emane.universal import EmaneUniversalModel
 from core.enumerations import ConfigDataTypes
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 
 class EmaneRfPipeModel(EmaneModel):

daemon/core/emane/tdma.py

@@ -6,9 +6,6 @@ from core import emane
 from core.emane.emanemodel import EmaneModel
 from core.emane.universal import EmaneUniversalModel
 from core.enumerations import ConfigDataTypes
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 
 class EmaneTdmaModel(EmaneModel):

daemon/core/emane/universal.py

@@ -6,9 +6,6 @@ used for the Universal PHY.
 from core import emane
 from core.emane.emanemodel import EmaneModel
 from core.enumerations import ConfigDataTypes
-from core.misc import log
-
-logger = log.get_logger(__name__)
 
 
 class EmaneUniversalModel(EmaneModel):