gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

make debug logging more useful by removing verbose debug stanzas

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2016-08-29 03:48:09 +00:00
parent 19253192b7
commit 556369e2f5
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/bombshell-client
View File

@ -210,7 +210,6 @@ class Signaler(MyThread):
def unblock(fobj): def unblock(fobj):
logging.debug("Unblocking file object %s", fobj)
os.set_blocking(fobj.fileno(), False) os.set_blocking(fobj.fileno(), False)
@ -223,7 +222,6 @@ def write(dst, buffer, l):
raise Exception("copy: Failed to write any bytes") raise Exception("copy: Failed to write any bytes")
mv = mv[writtenthisloop:] mv = mv[writtenthisloop:]
alreadywritten = alreadywritten + writtenthisloop alreadywritten = alreadywritten + writtenthisloop
logging.debug("write: Relayed %s bytes to sink %s", alreadywritten, dst)
def copy(src, dst, buffer, l): def copy(src, dst, buffer, l):
@ -237,7 +235,6 @@ def copy(src, dst, buffer, l):
raise Exception("copy: Failed to read any bytes") raise Exception("copy: Failed to read any bytes")
mv = mv[readthisloop:] mv = mv[readthisloop:]
alreadyread = alreadyread + readthisloop alreadyread = alreadyread + readthisloop
logging.debug("copy: Read %s bytes from %s", alreadyread, src)
return write(dst, buffer, l) return write(dst, buffer, l)
@ -256,23 +253,18 @@ class DataMultiplexer(MyThread):
sources, _, x = select.select((s for s in self.sources), (), (s for s in self.sources)) sources, _, x = select.select((s for s in self.sources), (), (s for s in self.sources))
assert not x, x assert not x, x
while sources: while sources:
logging.debug("mux: Sources that alarmed: %s", [self.sources[s] for s in sources])
for s in sources: for s in sources:
n = self.sources[s] n = self.sources[s]
logging.debug("mux: Source %s (%s) is active", n, s) logging.debug("mux: Source %s (%s) is active", n, s)
readthisloop = s.readinto(buffer) readthisloop = s.readinto(buffer)
if readthisloop == 0: if readthisloop == 0:
logging.debug("mux: Received no bytes from source %s", n) logging.debug("mux: Received no bytes from source %s, signaling peer to close corresponding source", n)
del self.sources[s] del self.sources[s]
header = struct.pack(PACKFORMAT, n, False, 0) header = struct.pack(PACKFORMAT, n, False, 0)
logging.debug("mux: Sending packet: %s" % header)
self.sink.write(header) self.sink.write(header)
logging.debug("mux: Informed sink about death of source %s", n)
continue continue
l = readthisloop l = readthisloop
logging.debug("mux: Received %s bytes from source %s", l, n)
header = struct.pack(PACKFORMAT, n, True, l) header = struct.pack(PACKFORMAT, n, True, l)
logging.debug("mux: Sending packet: %s" % header)
self.sink.write(header) self.sink.write(header)
write(self.sink, buffer, l) write(self.sink, buffer, l)
if not self.sources: if not self.sources:
@ -297,11 +289,8 @@ class DataDemultiplexer(MyThread):
while self.sinks: while self.sinks:
r, _, x = select.select([self.source], (), [self.source]) r, _, x = select.select([self.source], (), [self.source])
assert not x, x assert not x, x
logging.debug("demux: Source alarmed")
for s in r: for s in r:
logging.debug("demux: Source %s is active", s)
header = s.read(PACKLEN) header = s.read(PACKLEN)
logging.debug("demux: received packet: %s" % header)
if header == "": if header == "":
logging.debug("demux: Received no bytes from source, closing all sinks") logging.debug("demux: Received no bytes from source, closing all sinks")
for sink in self.sinks.values(): for sink in self.sinks.values():
@ -314,7 +303,6 @@ class DataDemultiplexer(MyThread):
self.sinks[n].close() self.sinks[n].close()
del self.sinks[n] del self.sinks[n]
else: else:
logging.debug("demux: Source %s is sending %s bytes, relaying to corresponding sink", s, l)
copy(self.source, self.sinks[n], buffer, l) copy(self.source, self.sinks[n], buffer, l)
logging.debug("demux: End of data demultiplexer") logging.debug("demux: End of data demultiplexer")
@ -323,14 +311,14 @@ def main_master():
global logging global logging
logging = LoggingEmu("master") logging = LoggingEmu("master")
logging.info("Started with arguments: %s", sys.argv[1:])
global debug_enabled global debug_enabled
args = sys.argv[1:] args = sys.argv[1:]
if args[0] == "-d": if args[0] == "-d":
args = args[1:] args = args[1:]
debug_enabled = True debug_enabled = True
logging.info("Started with arguments: %s", sys.argv[1:])
remote_vm = args[0] remote_vm = args[0]
remote_command = args[1:] remote_command = args[1:]
assert remote_command assert remote_command
@ -422,12 +410,12 @@ def main_remote():
global logging global logging
logging = LoggingEmu("remote") logging = LoggingEmu("remote")
logging.info("Started with arguments: %s", sys.argv[1:])
global debug_enabled global debug_enabled
if "-d" in sys.argv[1:]: if "-d" in sys.argv[1:]:
debug_enabled = True debug_enabled = True
logging.info("Started with arguments: %s", sys.argv[1:])
try: try:
send_beacon(sys.stdout) send_beacon(sys.stdout)
except Exception as e: except Exception as e: