AaronFiore/electrum
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
ThomasV
2011-11-26 23:47:28 +03:00
parent 7171a4b1b5 4c0f06f39d
commit e7d233a7a2
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/electrum.conf.sample
View File

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

7
server/server.py
View File

@@ -509,7 +509,12 @@ if __name__ == '__main__':
conf = DataStore.CONFIG_DEFAULTS
args, argv = readconf.parse_argv( [], conf)
args.dbtype= config.get('database','type')
args.connect_args = {'database' : config.get('database','database') }
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') }
store = MyStore(args)
thread.start_new_thread(listen_thread, (store,))