started a revision of the logging wrapping print() into printlog() to…

… add timestamp for all messages and

then introduce in future a conditional approach to skip some logging both for performance and readability

d-rats.py

@@ -25,6 +25,9 @@
 import traceback
 import gtk
 
+#importing print() wrapper
+from d_rats.debug import printlog
+
 sys.path.insert(0, os.path.join("/usr/share", "d-rats"))
 
 #import module to have spelling correction in chat and email applications
@@ -51,7 +54,7 @@ def handle_exception(exctyp, value, tb):
     _trace = traceback.format_exception(exctyp, value, tb)
     trace = os.linesep.join(_trace)
 
-    print(("---- GUI Exception ----\n%s\n---- End ----\n" % trace))
+    printlog("---- GUI Exception ----\n%s\n---- End ----\n" % trace)
 
     msg = """
 <b><big>D-RATS has encountered an error.</big></b>
@@ -120,7 +123,7 @@ def ignore_exception(exctyp, value, tb):
     from d_rats import dplatform
 
     if opts.config:
-        print("D-Rats     : re-config option found -- Reconfigure D-rats")
+        printlog("D-Rats    : re-config option found -- Reconfigure D-rats")
         dplatform.get_platform(opts.config)
 
     # import the D-Rats main application
@@ -134,10 +137,12 @@ def ignore_exception(exctyp, value, tb):
 
     # create the mainapp with the basic options 
     app = mainapp.MainApp(safe=opts.safe)
-
+
+    printlog("D-Rats    : reloading app\n\n")
     # finally let's open the default application triggering it differently if we 
     # want to profile it (which is running the app under profile control to see what happens) 
     if opts.profile :
+        printlog("D-Rats     : Executing with cprofile")
         import cProfile
         cProfile.run('app.main()')
     else:

d_rats/agw.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 from __future__ import print_function
+#importing printlog() wrapper
+from .debug import printlog
+
 import struct
 from . import utils
 import sys
@@ -155,7 +158,7 @@ def recv_frame_type(self, kind, poll=False):
             f = self.__recv_frame()
             self.__lock.release()
             if f:
-                print(("Agw       : Got %s frame while waiting for %s" % (chr(f.kind), kind)))
+                printlog(("Agw       : Got %s frame while waiting for %s" % (chr(f.kind), kind)))
                 self._framebuf[f.kind].insert(0, f)
             elif not poll:
                 return None
@@ -186,15 +189,15 @@ def connect(self, tocall):
         self._agw.send_frame(cf)
 
         f = self._agw.recv_frame_type("C", True)
-        print(("Agw       : %s" % f.get_payload()))
+        printlog(("Agw       : %s" % f.get_payload()))
 
     def disconnect(self):
         df = AGWFrame_d()
         df.set_from(self._mycall)
         self._agw.send_frame(df)
 
         f = self._agw.recv_frame_type("d", True)
-        print(("Agw       : %s" % f.get_payload()))
+        printlog(("Agw       : %s" % f.get_payload()))
 
     def send(self, data):
         df = AGWFrame_D()
@@ -232,10 +235,10 @@ def agw_recv_frame(s):
                 f.unpack(data)
                 data = ""
             except Exception as e:
-                #print("Failed: %s" % e)
+                #printlog("Failed: %s" % e)
                 continue
             prin("Agw       : %s -> %s [%s]" % (f.get_from(), f.get_to(), chr(f.kind)))
-            utils.hexprint(f.get_payload())
+            utils.hexprintlog(f.get_payload())
             return
 
 def test_raw_recv(s):
@@ -264,17 +267,17 @@ def test_class_connect():
     agw = AGWConnection("127.0.0.1", 8000, 0.5)
     axc = AGW_AX25_Connection(agw, "KK7DS")
     axc.connect("N7AAM-11")
-    print(("Agw       : %s" % axc.recv_text()))
+    printlog(("Agw       : %s" % axc.recv_text()))
 
     while True:
-        print("Agw       : packet> ")
+        printlog("Agw       : packet> ")
         l = sys.stdin.readline().strip()
         if len(l) > 0:
             axc.send(l + "\r")
         r = True
         while r:
             r = axc.recv_text()
-            print(("Agw       : %s" % r))
+            printlog(("Agw       : %s" % r))
 
     axc.disconnect()
 
@@ -337,7 +340,7 @@ def transmit_data(conn, dcall, spath, data):
                     0xF0)    # PID: No layer 3
     d += data
 
-    utils.hexprint(d)
+    utils.hexprintlog(d)
 
     f = AGWFrame_K()
     f.set_payload(d)

d_rats/ax25.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 from __future__ import print_function
+#importing printlog() wrapper
+from .debug import printlog
+
 from six.moves import range
 bstr_pos = lambda n: n>0 and bstr_pos(n>>1)+str(n&1) or ''
 
@@ -21,15 +24,15 @@ def _store_bit(self, bit):
             self.ones += 1
         else:
             self.ones = 0
-        print(("Register: %s" % bstr_pos(self.register)))
+        printlog(("Register: %s" % bstr_pos(self.register)))
         self.bits += 1
         if self.bits == 8:
-            print("Ax25      : Pushing")
+            printlog("Ax25      : Pushing")
             self.push()
 
     def store_bit(self, bit):
         if bit and self.ones == 5:
-            print("Stuffing!")
+            printlog("Stuffing!")
             self._store_bit(0)
         self._store_bit(bit)
 
@@ -53,8 +56,8 @@ def bitstuff(data):
 
     data = "\xFF\xFF\xFF"
 
-    print("Start:")
-    hexprint(data)
+    printlog("Start:")
+    hexprintlog(data)
 
-    print("\nStuffed:")
-    hexprint(bitstuff(data))
+    printlog("\nStuffed:")
+    hexprintlog(bitstuff(data))

d_rats/cap.py

@@ -17,6 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+#importing printlog() wrapper
+from .debug import printlog
+
 import libxml2
 import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error
 import tempfile
@@ -25,7 +28,7 @@
 try:
     from hashlib import md5
 except ImportError:
-    print("Installing hashlib replacement hack")
+    printlog("Installing hashlib replacement hack")
     from .utils import ExternalHash as md5
 
 def ev_cmp_exp(ev1, ev2):
@@ -114,7 +117,7 @@ def __init__(self, filename):
                         hashes.append(hash.digest())
 
                 except Exception as e:
-                    print(("Unable to parse CAP node: %s (%s)" % (child.name, e)))
+                    printlog(("Unable to parse CAP node: %s (%s)" % (child.name, e)))
 
             child = child.next
 
@@ -156,8 +159,8 @@ def __init__(self, url):
 
     c = 0
     for i in cp.events_expiring_after(epoch):
-        print((i.report()))
+        printlog((i.report()))
         c += 1
 
-    print(("%i events" % c))
+    printlog(("%i events" % c))