* fix config file keys for MySQL.

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 4cd4b5b..b58e99a 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -39,6 +39,7 @@ config.set('server','banner', 'Welcome to Electrum!')
 config.set('server', 'host', 'ecdsa.org')
 config.set('server', 'port', 50000)
 config.set('server', 'password', '')
+config.set('server', 'irc', 'yes')
 config.add_section('database')
 config.set('database', 'type', 'psycopg2')
 config.set('database', 'database', 'abe')
@@ -512,14 +513,15 @@ if __name__ == '__main__':
     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') }
+       args.connect_args = { 'db' : config.get('database','database'), 'user' : config.get('database','username'), 'passwd' : config.get('database','password') }
     elif args.dbtype == 'psycopg2':
        args.connect_args = { 'database' : config.get('database','database') }
     store = MyStore(args)
 
     thread.start_new_thread(listen_thread, (store,))
     thread.start_new_thread(clean_session_thread, ())
-    thread.start_new_thread(irc_thread, ())
+    if (config.get('server','irc') == 'yes' ):
+       thread.start_new_thread(irc_thread, ())
 
     while not stopping:
         try: