[Kimchi-devel] [PATCH 2/5] Code cleanup.

[Leonardo Garcia]

From: Leonardo Garcia <lagarcia at br.ibm.com>

Remove useless statements and improve debug message.

Signed-off-by: Leonardo Garcia <lagarcia at br.ibm.com>
---
 src/kimchi/auth.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py
index 242fdcf..f9873ca 100644
--- a/src/kimchi/auth.py
+++ b/src/kimchi/auth.py
@@ -87,13 +87,11 @@ def check_auth_session():
     for the user.
     """
     try:
-        s = cherrypy.session[SESSION_USER]
-        user = cherrypy.request.login = cherrypy.session[SESSION_USER]
-        debug("Authenticated with session: %s, for user: %s" % (s, user))
+        user = cherrypy.session[USER_ID]
+        debug("Session authenticated for user %s" % user)
     except KeyError:
         debug("Session not found")
         return False
-    debug("Session found for user %s" % user)
     return True
 
 
@@ -135,8 +133,7 @@ def login(userid, password):
 
 def logout():
     cherrypy.session.acquire_lock()
-    userid = cherrypy.session.get(SESSION_USER, None)
-    cherrypy.session[SESSION_USER] = cherrypy.request.login = None
+    cherrypy.session[USER_ID] = None
     cherrypy.session.release_lock()
     cherrypy.lib.sessions.expire()
 
-- 
1.8.5.3