Added log module

settingsd/application.py

@@ -69,7 +69,7 @@ class Application(object) :
 		config.loadConfig()
 
 	def initBus(self) :
-		if config.value("service", "bus_type") == const.CONFIG_SERVICE_BUS_TYPE_SYSTEM :
+		if config.value("service", "bus_type") == const.SERVICE_BUS_TYPE_SYSTEM :
 			bus = dbus.SystemBus()
 		else :
 			bus = dbus.SessionBus()

settingsd/config.py

@@ -12,10 +12,10 @@ import validators
 #####
 ConfigDictObject = {
 	"service" : {
-		"name" : (const.DEFAULT_CONFIG_SERVICE_NAME, validators.string),
-		"path" : (const.DEFAULT_CONFIG_SERVICE_PATH, validators.string),
-		"bus_type" : ( const.DEFAULT_CONFIG_SERVICE_BUS_TYPE,
-			( lambda arg : validators.validRange(arg, const.CONFIG_VALID_SERVICE_BUS_TYPES_LIST) ) )
+		"name" : (const.DEFAULT_SERVICE_NAME, str),
+		"path" : (const.DEFAULT_SERVICE_PATH, str),
+		"bus_type" : (const.DEFAULT_SERVICE_BUS_TYPE, ( lambda arg : validators.validRange(arg, const.ALL_SERVICE_BUS_TYPES_LIST) )),
+		"log_level" : (const.DEFAULT_LOG_LEVEL, ( lambda arg : int(validators.validRange(arg, const.ALL_LOG_LEVELS_LIST)) ))
 	}
 }
 

settingsd/const.py

@@ -9,15 +9,25 @@ CONFIGS_DIR = "configs"
 CONFIG_FILE_POSTFIX = ".conf"
 
 
-CONFIG_SERVICE_BUS_TYPE_SYSTEM = "system"
-CONFIG_SERVICE_BUS_TYPE_SESSION = "session"
-CONFIG_VALID_SERVICE_BUS_TYPES_LIST = (
-	CONFIG_SERVICE_BUS_TYPE_SYSTEM,
-	CONFIG_SERVICE_BUS_TYPE_SESSION
+SERVICE_BUS_TYPE_SYSTEM = "system"
+SERVICE_BUS_TYPE_SESSION = "session"
+ALL_SERVICE_BUS_TYPES_LIST = (
+	SERVICE_BUS_TYPE_SYSTEM,
+	SERVICE_BUS_TYPE_SESSION
+)
+
+LOG_LEVEL_INFO = 0
+LOG_LEVEL_VERBOSE = 1
+LOG_LEVEL_DEBUG = 2
+ALL_LOG_LEVELS_LIST = (
+	LOG_LEVEL_INFO,
+	LOG_LEVEL_VERBOSE,
+	LOG_LEVEL_DEBUG
 )
 
 
-DEFAULT_CONFIG_SERVICE_NAME = "org.etersoft.%s" % (MY_NAME)
-DEFAULT_CONFIG_SERVICE_PATH = "/org/etersoft/%s" % (MY_NAME)
-DEFAULT_CONFIG_SERVICE_BUS_TYPE = CONFIG_SERVICE_BUS_TYPE_SYSTEM
+DEFAULT_SERVICE_NAME = "org.etersoft.%s" % (MY_NAME)
+DEFAULT_SERVICE_PATH = "/org/etersoft/%s" % (MY_NAME)
+DEFAULT_SERVICE_BUS_TYPE = SERVICE_BUS_TYPE_SYSTEM
+DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO
 

settingsd/logger.py

+# -*- coding: utf-8 -*-
+
+
+import sys
+
+import const
+import config
+
+
+#####
+def message(log_level, message) :
+	text_log_levels_list = [
+		"%s [ Info ]:" % (const.MY_NAME), # const.LOG_LEVEL_INFO == 0
+		"%s [ Details ]:" % (const.MY_NAME), # const.LOG_LEVEL_VERBOSE == 1
+		"%s [ Debug ]:" % (const.MY_NAME) # # const.LOG_LEVEL_DEBUG == 2
+	]
+	if log_level <= config.value("service", "log_level") :
+		print >> sys.stderr, text_log_levels_list[log_level], message
+

settingsd/validators.py

@@ -7,9 +7,6 @@ class ValidatorError(Exception) :
 
 
 ##### Public #####
-def string(arg) :
-	return str(arg)
-
 def validBool(arg) :
 	arg = str(arg).lower()
 	true_args_list = ("1", "true", "yes")