scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 04:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cisco-py: Improve logging handling, print output in human readable format

Browse Source 
Output interprets newlines as such.
This commit is contained in:
Ben Greear
2019-12-16 20:13:11 -08:00
parent 8333416479
commit f2a2bfed1b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cisco_wifi_ctl.py
View File

@@ -71,7 +71,7 @@ def main():
parser.add_argument("-p", "--passwd", type=str, help="credential password") parser.add_argument("-p", "--passwd", type=str, help="credential password")
parser.add_argument("-s", "--scheme", type=str, choices=["serial", "ssh", "telnet"], help="Connect via serial, ssh or telnet") parser.add_argument("-s", "--scheme", type=str, choices=["serial", "ssh", "telnet"], help="Connect via serial, ssh or telnet")
parser.add_argument("-t", "--tty", type=str, help="tty serial device") parser.add_argument("-t", "--tty", type=str, help="tty serial device")
parser.add_argument("-l", "--log", type=str, help="logfile for messages") parser.add_argument("-l", "--log", type=str, help="logfile for messages, stdout means output to console")
#parser.add_argument("-r", "--radio", type=str, help="select radio") #parser.add_argument("-r", "--radio", type=str, help="select radio")
parser.add_argument("-a", "--ap", type=str, help="select AP") parser.add_argument("-a", "--ap", type=str, help="select AP")
parser.add_argument("--action", type=str, help="perform action", parser.add_argument("--action", type=str, help="perform action",
@@ -100,12 +100,15 @@ def main():
logg.setLevel(logging.DEBUG) logg.setLevel(logging.DEBUG)
file_handler = None file_handler = None
if (logfile is not None): if (logfile is not None):
file_handler = logging.FileHandler(logfile, "w") if (logfile != "stdout"):
file_handler.setLevel(logging.DEBUG) file_handler = logging.FileHandler(logfile, "w")
file_handler.setFormatter(formatter) file_handler.setLevel(logging.DEBUG)
logg.addHandler(file_handler) file_handler.setFormatter(formatter)
logg.addHandler(file_handler)
logging.basicConfig(format=FORMAT, handlers=[console_handler, file_handler]) logging.basicConfig(format=FORMAT, handlers=[file_handler])
else:
# stdout logging
logging.basicConfig(format=FORMAT, handlers=[console_handler])
egg = None # think "eggpect" egg = None # think "eggpect"
try: try:
@@ -225,6 +228,7 @@ def main():
logg.info("Command[%s]"%command) logg.info("Command[%s]"%command)
egg.sendline(command); egg.sendline(command);
i = egg.expect([CCPROMPT, AREYOUSURE]) i = egg.expect([CCPROMPT, AREYOUSURE])
print (egg.before.decode('utf-8', 'ignore'))
if i == 1: if i == 1:
egg.sendline("y") egg.sendline("y")