From 4c18952c3efa8bffa51ef729018b546d3ffeb6cb Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Fri, 23 Apr 2010 17:42:02 +0300 Subject: [PATCH] log-parser: true generic parse_status_file (no database dependency); add print callback --- ppf/log-parser/generic/GenericStatusParser.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ppf/log-parser/generic/GenericStatusParser.py b/ppf/log-parser/generic/GenericStatusParser.py index e9b30ca..4037a97 100644 --- a/ppf/log-parser/generic/GenericStatusParser.py +++ b/ppf/log-parser/generic/GenericStatusParser.py @@ -3,8 +3,6 @@ import sys import getopt import re -from DatabaseWriter import DatabaseWriter -from DatabaseCommander import DatabaseCommander import julian import datetime @@ -96,10 +94,13 @@ class GenericStatusParser: f.close() return self.parse_status_line(line) - def parse_status_file(self, client_session_id, session_start, filename, callback_func, callback_arg = None): + def cb_print(self, num_peers, dht, + download_speed, upload_speed, + download_size, upload_size, + eta_seconds): + print "ps = %d, dht = %d, ds = %d kb/s, us = %d kb/s, dsize = %d bytes, usize = %d bytes" % (num_peers, dht, download_speed, upload_speed, download_size, upload_size) - message_time = session_start - one_second = datetime.timedelta(0, 1) + def parse_status_file(self, filename, callback_func, callback_arg = None): try: fin = open(filename, "r") @@ -114,18 +115,15 @@ class GenericStatusParser: (num_peers, dht, download_speed, upload_speed, download_size, upload_size, eta_seconds) = self.parse_status_line(line) - message_time = message_time + one_second - logging.debug("(%d, %d, %d kb/s, %d kb/s, %d bytes, %d bytes)" % (num_peers, dht, download_speed, upload_speed, download_size, upload_size)) if callback_arg == None: - callback_func(client_session_id, message_time, - num_peers, dht, + callback_func(num_peers, dht, download_speed, upload_speed, download_size, upload_size, eta_seconds) else: - callback_func(callback_arg, client_session_id, message_time, + callback_func(callback_arg, num_peers, dht, download_speed, upload_speed, download_size, upload_size, -- 2.20.1