tMerge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into merge-requests/3 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e7d233a7a2de7424c737ed115b0e59fdc3e30c6c
DIR parent 7171a4b1b5b4cb7b0ac0140449163c2210fa9209
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 26 Nov 2011 23:47:28 +0300
Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into merge-requests/3
Diffstat:
M server/electrum.conf.sample | 10 +++++++++-
M server/server.py | 7 ++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
---
DIR diff --git a/server/electrum.conf.sample b/server/electrum.conf.sample
t@@ -1,5 +1,5 @@
[server]
-host = 127.0.0.1
+host = localhost
port = 50000
password = secret
banner = Welcome to Electrum!
t@@ -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
DIR diff --git a/server/server.py b/server/server.py
t@@ -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,))