diff --git a/bin/mn b/bin/mn index 14d1b59..b0d2ec4 100755 --- a/bin/mn +++ b/bin/mn @@ -14,7 +14,7 @@ try: except ImportError: USE_RIPCORD = False -from mininet.logging_mod import lg, LEVELS +from mininet.log import lg, LEVELS from mininet.net import Mininet, init from mininet.node import KernelSwitch, Host, Controller, ControllerParams, NOX from mininet.node import RemoteController, UserSwitch, OVSKernelSwitch diff --git a/mininet/logging_mod.py b/mininet/log.py similarity index 98% rename from mininet/logging_mod.py rename to mininet/log.py index 85a059c..0c79479 100644 --- a/mininet/logging_mod.py +++ b/mininet/log.py @@ -78,7 +78,7 @@ class MininetLogger(Logger, object): Enable each mininet .py file to with one import: - from mininet.logging_mod import lg + from mininet.log import lg ...get a default logger that doesn't require one newline per logging call. diff --git a/mininet/net.py b/mininet/net.py index ec1e9ea..91c7be5 100755 --- a/mininet/net.py +++ b/mininet/net.py @@ -52,7 +52,7 @@ from subprocess import call import sys from time import sleep -from mininet.logging_mod import lg +from mininet.log import lg from mininet.node import KernelSwitch, OVSKernelSwitch from mininet.util import quietRun, fixLimits from mininet.util import make_veth_pair, move_intf, retry, MOVEINTF_DELAY diff --git a/mininet/node.py b/mininet/node.py index 8281bef..5edda82 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -9,7 +9,7 @@ import select flush = sys.stdout.flush -from mininet.logging_mod import lg +from mininet.log import lg from mininet.util import quietRun, macColonHex, ipStr diff --git a/mininet/util.py b/mininet/util.py index d919755..2e30c3b 100644 --- a/mininet/util.py +++ b/mininet/util.py @@ -6,7 +6,7 @@ from resource import setrlimit, RLIMIT_NPROC, RLIMIT_NOFILE import select from subprocess import call, check_call, Popen, PIPE, STDOUT -from mininet.logging_mod import lg +from mininet.log import lg def run(cmd):