Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into merge-requests/3

This commit is contained in:
ThomasV 2011-11-26 23:47:28 +03:00
commit e7d233a7a2
2 changed files with 15 additions and 2 deletions

View file

@ -1,5 +1,5 @@
[server] [server]
host = 127.0.0.1 host = localhost
port = 50000 port = 50000
password = secret password = secret
banner = Welcome to Electrum! banner = Welcome to Electrum!
@ -7,3 +7,11 @@ banner = Welcome to Electrum!
[database] [database]
type = sqlite3 type = sqlite3
database = electrum.sqlite database = electrum.sqlite
# type = MySQLdb
# database = electrum
# username = electrum
# password = secret
# type = psycopg2
# database = electrum

View file

@ -509,6 +509,11 @@ if __name__ == '__main__':
conf = DataStore.CONFIG_DEFAULTS conf = DataStore.CONFIG_DEFAULTS
args, argv = readconf.parse_argv( [], conf) args, argv = readconf.parse_argv( [], conf)
args.dbtype= config.get('database','type') args.dbtype= config.get('database','type')
if args.dbtype == 'sqlite3':
args.connect_args = { 'database' : config.get('database','database') }
elif args.dbtype == 'MySQLdb':
args.connect_args = { 'db' : config.get('database','database'), 'user' : config.get('database','user'), 'passwd' : config.get('database','pass') }
elif args.dbtype == 'psycopg2':
args.connect_args = { 'database' : config.get('database','database') } args.connect_args = { 'database' : config.get('database','database') }
store = MyStore(args) store = MyStore(args)