From 5f2d5dbc45f1bb84c3f58078cb132e0992ec0994 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Mon, 25 Apr 2011 00:52:05 -0400
Subject: Some further daemon cleanups.

- alias logs should be properly redirected
- needs to redirect sleekxmpp somewhere
---
 server/object.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'server/object.py')

diff --git a/server/object.py b/server/object.py
index c72a9a0..6ff04d3 100644
--- a/server/object.py
+++ b/server/object.py
@@ -8,6 +8,7 @@ import zlib
 import datetime
 import fileinput
 import logging
+logger = logging.getLogger("alias")
 
 from permission import *
 from config import config
@@ -28,7 +29,7 @@ class ObjectReader(Object):
     def __init__(self, owner, hash = None):
         Object.__init__(self, owner, hash)
         if not os.path.exists(self.object_path):
-            logging.error("Object {} can't be found for user {}".format(self.hash,
+            logger.error("Object {} can't be found for user {}".format(self.hash,
                                                                         self.owner))
             raise ObjectError
 
@@ -59,7 +60,7 @@ class ObjectReader(Object):
     def get_child_list(self, user):
         perm = self.get_permission(user)
         if not perm & LIST:
-            logging.error("User {} doesn't have the list permission for object {}"
+            logger.error("User {} doesn't have the list permission for object {}"
                           .format(user, self.hash))
             raise PermissionError
 
@@ -70,7 +71,7 @@ class ObjectReader(Object):
             try:
                 child = ObjectReader(self.owner, name)
             except ObjectError:
-                logging.error("Object {} can't be find for user {}".format(self.hash,
+                logger.error("Object {} can't be find for user {}".format(self.hash,
                                                                            self.owner))
             else:
                 perm, key = child.get_permission_key(user)
@@ -83,7 +84,7 @@ class ObjectReader(Object):
     def get_content(self, user):
         perm, key = self.get_permission_key(user)
         if not perm & READ :
-            logging.error("User {} doesn't have read access to object {}"
+            logger.error("User {} doesn't have read access to object {}"
                           .format(user, self.hash))
             raise PermissionError
 
@@ -99,7 +100,7 @@ class ObjectWriter(Object):
     def __init__(self, owner, hash = None):
         Object.__init__(self, owner, hash)
         if not os.path.exists(self.owner_path):
-            logging.error("User {} is not registered".format(self.owner))
+            logger.error("User {} is not registered".format(self.owner))
         os.makedirs(self.object_path)
         for filename in ['permissions', 'childs', 'object']:
             file=open(os.path.join(self.object_path, filename), "w")
-- 
cgit v1.2.3-70-g09d2