X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=260ad81b498db78895da49ff01b0624da6ae340b;hb=d1e80a452945a425297dd8ac8373924d627da7aa;hp=bb939f540edad4f4ed46aa702b7289238d320886;hpb=b86482dd26a79491bd562693c78c6b9950f2ccba;p=electrum-server.git

diff --git a/server.py b/server.py
index bb939f5..260ad81 100755
--- 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')
@@ -509,12 +510,18 @@ 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,))
     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: