From 7851505e645059e2a9bb6f0bb73b7b51ed7a6978 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 26 Apr 2013 13:07:11 +0530
Subject: [PATCH] [logging] added webnotes.log() and logging property in
 conf.py to enable debug logs

---
 public/js/wn/request.js    | 15 ++++++++++++++-
 webnotes/db.py             | 10 ++++++++++
 webnotes/utils/__init__.py |  3 +++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/public/js/wn/request.js b/public/js/wn/request.js
index dcb3258fd4..d0e55b3b48 100644
--- a/public/js/wn/request.js
+++ b/public/js/wn/request.js
@@ -170,9 +170,22 @@ wn.request.cleanup = function(opts, r) {
 	
 	// debug messages
 	if(r._debug_messages) {
+		console.log("-")
+		console.log("-")
+		console.log("-")
+		if(opts.args) {
+			console.log("<<<< arguments ");
+			console.log(opts.args);
+			console.log(">>>>")
+		}
 		$.each(JSON.parse(r._debug_messages), function(i, v) { console.log(v); });
-		console.log("Response:");
+		console.log("<<<< response");
+		delete r._debug_messages;
 		console.log(r);
+		console.log(">>>>")
+		console.log("-")
+		console.log("-")
+		console.log("-")
 	}
 	
 	if(r['403']) {
diff --git a/webnotes/db.py b/webnotes/db.py
index 1f62ba844e..8e25792527 100644
--- a/webnotes/db.py
+++ b/webnotes/db.py
@@ -103,6 +103,12 @@ class Database:
 						webnotes.errprint(query % values)
 					except TypeError:
 						webnotes.errprint([query, values])
+				if getattr(conf, "logging", False)==2:
+					webnotes.log("<<<< query")
+					webnotes.log(query)
+					webnotes.log("with values:")
+					webnotes.log(values)
+					webnotes.log(">>>>")
 				
 				self._cursor.execute(query, values)
 				
@@ -110,6 +116,10 @@ class Database:
 				if debug:
 					self.explain_query(query)
 					webnotes.errprint(query)
+				if getattr(conf, "logging", False)==2:
+					webnotes.log("<<<< query")
+					webnotes.log(query)
+					webnotes.log(">>>>")
 					
 				self._cursor.execute(query)	
 		except Exception, e:
diff --git a/webnotes/utils/__init__.py b/webnotes/utils/__init__.py
index f92aaaac3e..2a94c130a0 100644
--- a/webnotes/utils/__init__.py
+++ b/webnotes/utils/__init__.py
@@ -193,9 +193,12 @@ def now_datetime():
 
 def get_user_time_zone():
 	global user_time_zone
+	if not user_time_zone:
+		user_time_zone = webnotes.cache().get_value("time_zone")
 	if not user_time_zone:
 		user_time_zone = webnotes.conn.get_value('Control Panel', None, 'time_zone') \
 			or 'Asia/Calcutta'
+		webnotes.cache().set_value("time_zone", user_time_zone)
 	return user_time_zone
 
 def convert_utc_to_user_timezone(utc_timestamp):