[pkg-fso-commits] [SCM] framworkd debian packageing branch, master, updated. milestone2-110-g76700a0

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit d0b8a65c7eea3b95d2d5f6f6761d7902a405e6ed
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Aug 28 21:20:45 2008 +0200

    ousaged: convert to Python logging

diff --git a/framework/subsystems/ousaged/generic.py b/framework/subsystems/ousaged/generic.py
index 875e3e7..9dce29e 100644
--- a/framework/subsystems/ousaged/generic.py
+++ b/framework/subsystems/ousaged/generic.py
@@ -9,21 +9,24 @@ Open Usage Daemon - Generic usage support
 GPLv2 or later
 """
 
-__version__ = "0.0.0"
+MODULE_NAME = "ousaged"
+__version__ = "0.1.0"
 
 DBUS_INTERFACE_PREFIX = "org.freesmartphone.Usage"
 DBUS_PATH_PREFIX = "/org/freesmartphone/Usage"
 
+from helpers import readFromFile, writeToFile
+
 import dbus
 import dbus.service
-import os
-import sys
-from syslog import syslog, LOG_ERR, LOG_WARNING, LOG_INFO, LOG_DEBUG
-from helpers import LOG, readFromFile, writeToFile
+
 from gobject import idle_add
 
+import os, sys
+import sys
+
 import logging
-logger = logging.getLogger('ousaged')
+logger = logging.getLogger( MODULE_NAME )
 
 class AbstractResource( object ):
     def __init__( self, usageControl ):
@@ -168,7 +171,7 @@ class GenericUsageControl( dbus.service.Object ):
         if old_owner and not new_owner:
             for resource in self.resources.values():
                 resource.cleanup( old_owner )
-                
+
     #
     # dbus methods
     #
diff --git a/framework/subsystems/ousaged/helpers.py b/framework/subsystems/ousaged/helpers.py
index 913508f..b6b793a 100644
--- a/framework/subsystems/ousaged/helpers.py
+++ b/framework/subsystems/ousaged/helpers.py
@@ -1,20 +1,25 @@
-import sys
-from syslog import syslog, LOG_ERR, LOG_WARNING, LOG_INFO, LOG_DEBUG
-from framework.config import LOG
+import logging
+logger = logging.getLogger('odeviced')
 
-# helpers
+#============================================================================#
 def readFromFile( path ):
+#============================================================================#
     try:
         value = open( path, 'r' ).read().strip()
     except IOError, e:
-        LOG( LOG_ERR, "(could not read from '%s': %s)" % ( path, e ) )
+        logger.warning( "(could not read from '%s': %s)" % ( path, e ) )
         return "N/A"
     else:
-        LOG( LOG_DEBUG, "(read '%s' from '%s')" % ( value, path ) )
+        logger.debug( "(read '%s' from '%s')" % ( value, path ) )
         return value
 
+#============================================================================#
 def writeToFile( path, value ):
-    LOG( LOG_DEBUG, "(writing '%s' to '%s')" % ( value, path ) )
-    f = open( path, 'w' )
-    if f:
+#============================================================================#
+    logger.debug( "(writing '%s' to '%s')" % ( value, path ) )
+    try:
+        f = open( path, 'w' )
+    except IOError, e:
+        logger.warning( "(could not write to '%s': %s)" % ( path, e ) )
+    else:
         f.write( "%s\n" % value )

-- 
framworkd debian packageing