Psst.. new poll here.
Psst.. new forums here.
Microsoft is blocking us again (TY IP Reputation!) so just use oauth login instead. :)
Paste
Pasted as Diff by derelm ( 18 years ago )
Index: main.py
===================================================================
--- main.py (Revision 113)
+++ main.py (Arbeitskopie)
@@ -7,93 +7,76 @@
#
# License: GPL-v3
#
+import sys
import j2j
from twisted.words.protocols.jabber import component
from twisted.internet import reactor
-import getopt,sys
+from optparse import OptionParser
+from config import Config
-def usage():
- print "./main.py [OPTIONS]"
- print " -h or --help This help"
- print " -v or --version Show version of J2J"
- print " -c file or --config=file Use another configuration file (defaults to: /etc/j2j/j2j.conf)"
- print
- print "See j2j.conf.example for example of configuration file"
- print "See http://wiki.jrudevels.org/J2J for help"
-
def main():
- __all__=['j2j','client','database','roster','utils','adhoc','debug','config']
- revision=0
- date=0
+ __all__ = ['j2j', 'client', 'database', 'roster', 'utils', 'adhoc', 'debug', 'config']
+ revision = 0
+ date = 0
- __id__="$Id$"
+ __id__ = "$Id$"
try:
- modRev=int(__id__.split(" ")[2])
- modDate=int(__id__.split(" ")[3].replace("-",""))
+ modRev = int(__id__.split(" ")[2])
+ modDate = int(__id__.split(" ")[3].replace("-", ""))
except:
- modRev=0
- modDate=0
-
- if modRev>revision:
- revision=modRev
- if modDate>date:
- date=modDate
-
+ modRev = 0
+ modDate = 0
+
+ if modRev > revision:
+ revision = modRev
+ if modDate > date:
+ date = modDate
+
for modName in __all__:
- module=__import__(modName,globals(),locals())
+ module = __import__(modName, globals(), locals())
try:
- modRev=int(module.__id__.split(" ")[2])
- modDate=int(module.__id__.split(" ")[3].replace("-",""))
+ modRev = int(module.__id__.split(" ")[2])
+ modDate = int(module.__id__.split(" ")[3].replace("-", ""))
except:
- modRev=0
- modDate=0
- if modRev>revision:
- revision=modRev
- if modDate>date:
- date=modDate
-
- if revision==0:
- revision=''
+ modRev = 0
+ modDate = 0
+ if modRev > revision:
+ revision = modRev
+ if modDate > date:
+ date = modDate
+
+ if revision == 0:
+ revision = ''
else:
- revision='.r'+str(revision)
- if date!=0:
- date=str(date)
- revision=revision+" %s-%s-%s" % (date[:4],date[4:6],date[6:8])
+ revision = '.r'+str(revision)
+ if date != 0:
+ date = str(date)
+ revision = revision + " %s-%s-%s" % (date[:4], date[4:6], date[6:8])
- version="1.1.8"+revision
+ version="1.1.8" + revision
- try:
- opts, args=getopt.getopt(sys.argv[1:], "c:vo:ho", ["help","config=","version"])
- except getopt.GetoptError, err:
- print str(err)
- usage()
- sys.exit(2)
- configFile=None
- for o,a in opts:
- if o in ("-v", "--version"):
- print "Jabber-To-Jabber component version:"+version
- sys.exit()
- elif o in ("-h", "--help"):
- usage()
- sys.exit()
- elif o in ("-c", "--config"):
- configFile=a
- else:
- assert False, "unhandled option"
- import config
- if configFile:
- config=config.config(configFile)
+ parser = OptionParser(version="Jabber-To-Jabber component version: " + version)
+ parser.add_option('-c', '--config', metavar='FILE', help="Read config from FILE")
+ options, args = parser.parse_args()
+
+ if options.config:
+ config = Config(options.config)
else:
- config=config.config()
+ config = Config()
- c=j2j.j2jComponent(reactor,version,config)
- f=component.componentFactory(config.JID,config.PASSWORD)
+ c = j2j.j2jComponent(reactor, version, config)
+ f = component.componentFactory(config.JID, config.PASSWORD)
connector = component.buildServiceManager(config.JID, config.PASSWORD, "tcp:%s:%s" % (config.HOST, config.PORT))
c.setServiceParent(connector)
connector.startService()
reactor.run()
if __name__ == "__main__":
- main()
Kein Zeilenvorschub am Ende der Datei
+ main()
Index: config.py
===================================================================
--- config.py (Revision 113)
+++ config.py (Arbeitskopie)
@@ -4,34 +4,35 @@
__id__ = "$Id$"
import os
+from ConfigParser import ConfigParser
-class config:
+class Config(object):
- def __init__(self, configname=["j2j.conf",os.path.expanduser("~/.j2j/j2j.conf"),"/etc/j2j/j2j.conf"]):
- import ConfigParser
- config=ConfigParser.ConfigParser()
+ def __init__(self, configname=["j2j.conf", os.path.expanduser("~/.j2j/j2j.conf"), "/etc/j2j/j2j.conf"]):
+ config = ConfigParser()
config.read(configname)
- self.JID=unicode(config.get("component","JID"),"utf-8")
- self.HOST=unicode(config.get("component","Host"),"utf-8")
- self.PORT=unicode(config.get("component","Port"),"utf-8")
- self.PASSWORD=unicode(config.get("component","Password"),"utf-8")
+ self.JID = unicode(config.get("component", "JID"), "utf-8")
+ self.HOST = unicode(config.get("component", "Host"), "utf-8")
+ self.PORT = unicode(config.get("component", "Port"), "utf-8")
+ self.PASSWORD = unicode(config.get("component", "Password"), "utf-8")
- self.DB_HOST=unicode(config.get("database","Host"),"utf-8")
- if self.DB_HOST=="":
- self.DB_HOST=None
- self.DB_TYPE=unicode(config.get("database","Type"),"utf-8")
- self.DB_USER=unicode(config.get("database","User"),"utf-8")
- self.DB_NAME=unicode(config.get("database","Name"),"utf-8")
- self.DB_PASS=unicode(config.get("database","Password"),"utf-8")
- self.DB_PREFIX=unicode(config.get("database","Prefix"),"utf-8")
+ self.DB_HOST = unicode(config.get("database", "Host"), "utf-8")
+ if self.DB_HOST == "":
+ self.DB_HOST = None
+ self.DB_TYPE = unicode(config.get("database", "Type"), "utf-8")
+ self.DB_USER = unicode(config.get("database", "User"), "utf-8")
+ self.DB_NAME = unicode(config.get("database", "Name"), "utf-8")
+ self.DB_PASS = unicode(config.get("database", "Password"), "utf-8")
+ self.DB_PREFIX = unicode(config.get("database", "Prefix"), "utf-8")
- self.LOGFILE=config.get("debug","logfile")
- self.DEBUG_REGISTRATIONS=config.getboolean("debug","registrations")
- self.DEBUG_LOGINS=config.getboolean("debug","logins")
- self.DEBUG_XMLLOG=config.get("debug","xml_logging")
- self.DEBUG_COMPXML=config.getboolean("debug","component_xml")
- self.DEBUG_CLXML=config.getboolean("debug","clients_xml")
- self.DEBUG_CLXMLACL=config.get("debug","clients_jids_to_log")
+ self.LOGFILE = config.get("debug", "logfile")
+ self.DEBUG_REGISTRATIONS = config.getboolean("debug", "registrations")
+ self.DEBUG_LOGINS = config.getboolean("debug", "logins")
+ self.DEBUG_XMLLOG = config.get("debug", "xml_logging")
+ self.DEBUG_COMPXML = config.getboolean("debug", "component_xml")
+ self.DEBUG_CLXML = config.getboolean("debug", "clients_xml")
+ self.DEBUG_CLXMLACL = config.get("debug", "clients_jids_to_log")
- admins=unicode(config.get("admins","List"),"utf-8")
- self.ADMINS=admins.split(",")
Kein Zeilenvorschub am Ende der Datei
+ admins=unicode(config.get("admins", "List"), "utf-8")
+ self.ADMINS=admins.split(",")
+
Revise this Paste