Restructuring and packet format

FPE/__init__.py

@@ -1,11 +1,60 @@
 import os
 import glob
+import time
 
-from .Destination import Destination
 from .FlexPE import FlexPE
 from .Identity import Identity
-from .Packet import Packet
 from .Transport import Transport
+from .Destination import Destination
+from .Packet import Packet
 
 modules = glob.glob(os.path.dirname(__file__)+"/*.py")
-__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+
+LOG_CRITICAL = 0
+LOG_ERROR    = 1
+LOG_WARNING  = 2
+LOG_NOTICE   = 3
+LOG_INFO     = 4
+LOG_VERBOSE  = 5
+LOG_DEBUG    = 6
+
+LOG_STDOUT	 = 0x91
+LOG_FILE     = 0x92
+
+loglevel 	 = LOG_NOTICE
+logfile      = None
+logdest      = LOG_STDOUT
+logtimefmt   = "%Y-%m-%d %H:%M:%S"
+
+def loglevelname(level):
+	if (level == LOG_CRITICAL):
+		return "Critical"
+	if (level == LOG_ERROR):
+		return "Error"
+	if (level == LOG_WARNING):
+		return "Warning"
+	if (level == LOG_NOTICE):
+		return "Notice"
+	if (level == LOG_INFO):
+		return "Info"
+	if (level == LOG_VERBOSE):
+		return "Verbose"
+	if (level == LOG_DEBUG):
+		return "Debug"
+	
+	return "Unknown"
+
+def log(msg, level=3):
+	# TODO: not thread safe
+	if loglevel >= level:
+		timestamp = time.time()
+		logstring = "["+time.strftime(logtimefmt)+"] ["+loglevelname(level)+"] "+msg
+
+		if (logdest == LOG_STDOUT):
+			print(logstring)
+
+		if (logdest == LOG_FILE and logfile != None):
+			file = open(logfile, "a")
+			file.write(logstring+"\n")
+			file.close()