Skip to content

Commit b7e7185

Browse files
90019001
committed
tersen logs
1 parent c0d19ad commit b7e7185

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

‎partftpy/TftpServer.py‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,8 @@ def listen(
9191
supply a different socket timeout value, if desired."""
9292
tftp_factory = TftpPacketFactory()
9393

94-
# Don't use new 2.5 ternary operator yet
95-
# listenip = listenip if listenip else '0.0.0.0'
96-
if not listenip:
97-
listenip = "0.0.0.0"
98-
log.info("Server requested on ip %s, port %s" % (listenip, listenport))
94+
listenip = listenip or "0.0.0.0"
95+
log.info("listening @ %s:%s" % (listenip, listenport))
9996
try:
10097
# FIXME - sockets should be non-blocking
10198
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -107,7 +104,7 @@ def listen(
107104

108105
self.is_running.set()
109106

110-
log.info("Starting receive loop...")
107+
log.debug("Starting receive loop...")
111108
while True:
112109
log.debug("shutdown_immediately is %s" % self.shutdown_immediately)
113110
log.debug("shutdown_gracefully is %s" % self.shutdown_gracefully)
@@ -195,9 +192,10 @@ def listen(
195192
log.warning(
196193
"received traffic on main socket for existing session??"
197194
)
198-
log.info("Currently handling these sessions:")
195+
t = "Active sessions:"
199196
for session_key, session in list(self.sessions.items()):
200-
log.info(" %s" % session)
197+
t += "\n %s" % (session,)
198+
log.info(t)
201199

202200
else:
203201
# Must find the owner of this traffic.
@@ -208,7 +206,7 @@ def listen(
208206
try:
209207
self.sessions[key].cycle()
210208
if self.sessions[key].state is None:
211-
log.info("Successful transfer.")
209+
log.debug("Successful transfer.")
212210
deletion_list.append(key)
213211
except TftpTimeoutExpectACK:
214212
self.sessions[key].timeout_expectACK = True
@@ -243,22 +241,20 @@ def listen(
243241

244242
log.debug("Iterating deletion list.")
245243
for key in deletion_list:
246-
log.info("")
247-
log.info("Session %s complete" % key)
244+
log.debug("Session %s complete" % key)
245+
t = "%s done: " % (key,)
248246
if key in self.sessions:
249247
log.debug("Gathering up metrics from session before deleting")
250248
self.sessions[key].end()
251-
metrics = self.sessions[key].metrics
252-
if metrics.duration == 0:
253-
log.info("Duration too short, rate undetermined")
249+
st = self.sessions[key].metrics
250+
if st.duration == 0:
251+
t += "Duration too short, rate undetermined; "
254252
else:
255-
log.info(
256-
"Transferred %d bytes in %.2f seconds"
257-
% (metrics.bytes, metrics.duration)
258-
)
259-
log.info("Average rate: %.2f kbps" % metrics.kbps)
260-
log.info("%.2f bytes in resent data" % metrics.resent_bytes)
261-
log.info("%d duplicate packets" % metrics.dupcount)
253+
t += "%d byte, %.2f sec, %.2f kbps, " % (st.bytes, st.duration, st.kbps)
254+
255+
t += "%d bytes resent, %d dupe pkts" % (st.resent_bytes, st.dupcount)
256+
log.info(t)
257+
262258
log.debug("Deleting session %s" % key)
263259
del self.sessions[key]
264260
log.debug("Session list is now %s" % self.sessions)

‎partftpy/TftpStates.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def sendACK(self, blocknumber=None):
131131
log.debug("In sendACK, passed blocknumber is %s", blocknumber)
132132
if blocknumber is None:
133133
blocknumber = self.context.next_block
134-
log.info("Sending ack to block %d" % blocknumber)
134+
log.debug("Sending ack to block %d" % blocknumber)
135135
ackpkt = TftpPacketACK()
136136
ackpkt.blocknumber = blocknumber
137137
# Testing hook
@@ -189,7 +189,7 @@ def resendLast(self):
189189
def handleDat(self, pkt):
190190
"""This method handles a DAT packet during a client download, or a
191191
server upload."""
192-
log.info("Handling DAT packet - block %d" % pkt.blocknumber)
192+
log.debug("Handling DAT packet - block %d" % pkt.blocknumber)
193193
log.debug("Expecting block %s", self.context.next_block)
194194
if pkt.blocknumber == self.context.next_block:
195195
log.debug("Good, received block %d in sequence", pkt.blocknumber)
@@ -248,7 +248,7 @@ def serverInitial(self, pkt, raddress, rport):
248248
sendoack = False
249249
if not self.context.tidport:
250250
self.context.tidport = rport
251-
log.info("Setting tidport to %s" % rport)
251+
log.debug("Setting tidport to %s" % rport)
252252

253253
log.debug("Setting default options, blksize")
254254
self.context.options = {"blksize": DEF_BLKSIZE}
@@ -300,7 +300,7 @@ def serverInitial(self, pkt, raddress, rport):
300300
self.full_path = os.path.abspath(full_path)
301301
log.debug("full_path is %s", full_path)
302302
if self.full_path.startswith(os.path.normpath(self.context.root) + os.sep):
303-
log.info("requested file is in the server root - good")
303+
log.debug("requested file is in the server root - good")
304304
else:
305305
log.warning("requested file is not within the server root - bad")
306306
self.sendError(TftpErrors.IllegalTftpOp)

0 commit comments

Comments
 (0)