From ef48052d410bce6c2f02288c71f3681b3eb217a3 Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Tue, 27 Mar 2018 08:24:28 -0700 Subject: [PATCH] fixed bad logging and updated commeffect to default to connectivity being on, same as emane default --- daemon/core/emane/commeffect.py | 4 ++-- daemon/core/emane/emanemodel.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/core/emane/commeffect.py b/daemon/core/emane/commeffect.py index 5ec67801..05efefc3 100644 --- a/daemon/core/emane/commeffect.py +++ b/daemon/core/emane/commeffect.py @@ -42,7 +42,7 @@ class EmaneCommEffectModel(EmaneModel): "", "receivebufferperiod"), ] _confmatrix_shim_091 = [ - ("defaultconnectivitymode", ConfigDataTypes.BOOL.value, "0", + ("defaultconnectivitymode", ConfigDataTypes.BOOL.value, "1", "On,Off", "defaultconnectivity"), ] _confmatrix_shim = _confmatrix_shim_base + _confmatrix_shim_091 @@ -110,7 +110,7 @@ class EmaneCommEffectModel(EmaneModel): nemid = emane_node.getnemid(netif) nemid2 = emane_node.getnemid(netif2) mbw = bw - + logger.info("sending comm effect event") event.append( nemid, latency=convert_none(delay), diff --git a/daemon/core/emane/emanemodel.py b/daemon/core/emane/emanemodel.py index 5752ed7e..080f4c3f 100644 --- a/daemon/core/emane/emanemodel.py +++ b/daemon/core/emane/emanemodel.py @@ -53,7 +53,7 @@ class EmaneModel(WirelessModel): :param core.emane.emanemanager.EmaneManager emane_manager: emane manager for the session :return: nothing """ - logger.info("%s has no post setup tasks: interface(%s)", ifc) + logger.info("emane model(%s) has no post setup tasks", self.name) def buildnemxmlfiles(self, e, ifc): """