From 1144f537f467e1afbd73df58b9ac7eabda997c05 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 12 Jul 2007 15:30:39 +0000
Subject: [PATCH] kernel: add logger error when drop db failed

bzr revid: ced-7e6c7d33a9f09b5b31c7edaa36dc67d1bc26065e
---
 bin/service/web_services.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 80ca88b03ff..46f42a79809 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -143,10 +143,11 @@ class db(netsvc.Service):
 			res = tools.exec_pg_command('dropdb', '--quiet', '--username='+tools.config['db_user'], db_name)
 		else:
 			res = tools.exec_pg_command('dropdb', '--quiet', db_name)
+		logger = netsvc.Logger()
 		if res:
+			logger.notifyChannel("web-service", netsvc.LOG_ERROR, 'DROP DB: %s failed' % (db_name,))
 			raise "Couldn't drop database"
 		else:
-			logger = netsvc.Logger()
 			logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DROP DB: %s' % (db_name))
 			return True
 
@@ -160,9 +161,10 @@ class db(netsvc.Service):
 		stdin.close()
 		data = stdout.read()
 		res = stdout.close()
-		if res:
-			raise "Couldn't dump database"
 		logger = netsvc.Logger()
+		if res:
+			logger.notifyChannel("web-service", netsvc.LOG_ERROR, 'DUMP DB: %s failed\n%s' % (db_name, data))
+			raise "Couldn't dump database"
 		logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DUMP DB: %s' % (db_name))
 		return base64.encodestring(data)
 
@@ -199,7 +201,7 @@ class db(netsvc.Service):
 			logger.notifyChannel("web-services", netsvc.LOG_INFO, 'RESTORE DB: %s' % (db_name))
 			return True
 		raise "Couldn't create database"
-		
+
 	def db_exist(self, db_name):
 		try:
 			db = sql_db.db_connect(db_name)
@@ -207,13 +209,7 @@ class db(netsvc.Service):
 			return True
 		except:
 			return False
-			
-#		cr.execute("select datname from pg_database where datname=%s", (db_name,))
-#		res = bool(cr.rowcount)
-#		cr.close()
-#		del cr
-#		return res
-		
+
 	def list(self):
 		db = sql_db.db_connect('template1')
 		try: