From 3122251c3f7f1fce8647912377b2065a803c7281 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 30 Aug 2011 11:38:22 +0530 Subject: [PATCH] added get_db_password in webnotes --- cgi-bin/webnotes/__init__.py | 10 ++++++++++ cgi-bin/webnotes/utils/scheduler.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cgi-bin/webnotes/__init__.py b/cgi-bin/webnotes/__init__.py index 06833e2e77..551a719af8 100644 --- a/cgi-bin/webnotes/__init__.py +++ b/cgi-bin/webnotes/__init__.py @@ -197,3 +197,13 @@ def setup_logging(): if getattr(defs, 'log_file_name', None): setup_logging() +def get_db_password(db_name): + from webnotes import defs + if hasattr(defs, 'get_db_password'): + return defs.get_db_password(db_name) + + elif hasattr(defs, 'db_password'): + return defs.db_password + + else: + return db_name \ No newline at end of file diff --git a/cgi-bin/webnotes/utils/scheduler.py b/cgi-bin/webnotes/utils/scheduler.py index 96db7bb5d8..7caa1fd6ee 100644 --- a/cgi-bin/webnotes/utils/scheduler.py +++ b/cgi-bin/webnotes/utils/scheduler.py @@ -89,7 +89,7 @@ class Scheduler: import webnotes, webnotes.defs, webnotes.db try: - webnotes.conn = webnotes.db.Database(user=db_name, password=webnotes.defs.db_password) + webnotes.conn = webnotes.db.Database(user=db_name, password=webnotes.get_db_password(db_name)) webnotes.session = {'user':'Administrator'} module = '.'.join(event.split('.')[:-1])