--- a/iro/iro.py Fri Oct 08 02:59:04 2010 +0200
+++ b/iro/iro.py Wed Nov 03 01:18:38 2010 +0100
@@ -27,6 +27,7 @@
from job import SMSJob, FAXJob, MailJob
from joblist import Joblist
from providerlist import Providerlist
+from acounting import Acounting
class MyUserDB(UserDB):
def __init__(self, userlist,jobqueue):
@@ -97,6 +98,7 @@
MyManager.register('FAXob', FAXJob)
MyManager.register('MailJob',MailJob)
MyManager.register('Providerlist',Providerlist)
+ MyManager.register('Acounting',Acounting)
manager = MyManager()
manager.start()
@@ -113,6 +115,17 @@
smstrade=MySmstrade()
smstrade.read_basic_config(conf)
+
+ cp = ConfigParser.ConfigParser()
+ cp.read(conf)
+ dbconn={'type':cp.get('db', 'type'),
+ 'host':cp.get('db', 'host'),
+ 'db':cp.get('db', 'db'),
+ 'user':cp.get('db', 'user'),
+ 'passwd':cp.get('db', 'passwd'),
+ 'table':cp.get('db', 'table'),
+ }
+
#Benutzerdatenbank erstellen
queue = Queue()
@@ -125,7 +138,7 @@
provider.setDefault("sms","smstrade")
provider.setDefault("fax","sipgate")
provider.setDefault("mail","localhost")
- jobqueue=Joblist(manager, queue, provider)
+ jobqueue=Joblist(manager, queue, provider,dbconn)
userdb=MyUserDB(userlist,jobqueue)