diff --git a/server.py b/server.py index 4135f9a..2b22cdb 100755 --- a/server.py +++ b/server.py @@ -4,12 +4,14 @@ import setuptools, servertools, socketserver, syslog, threading if __name__ == "__main__": socketserver.TCPServer.allow_reuse_address = True + bind = setuptools.getSetting("Server", "bind") or "0.0.0.0" + port = int(setuptools.getSetting("Server", "port")) or 5747 try: - server = servertools.TCPServer((setuptools.getSetting("Server", "bind"), int(setuptools.getSetting("Server", "port"))), servertools.TCPHandler) + server = servertools.TCPServer((bind, port), servertools.TCPHandler) except: - servertools.logger("Unable to bind on %s:%s. Make sure the port is not in use or use a different port." % (setuptools.getSetting("Server", "bind"), setuptools.getSetting("Server", "port"))) + servertools.logger("Unable to bind on %s:%i. Make sure the port is not in use or use a different port." % (bind, port)) servertools.shutdown(status=1) - servertools.logger("Kumi Status server running on %s:%s." % (setuptools.getSetting("Server", "bind"), setuptools.getSetting("Server", "port"))) + servertools.logger("Kumi Status server running on %s:%i." % (bind, port)) try: thread = threading.Thread(target=server.serve_forever(), daemon=True) diff --git a/setuptools/__init__.py b/setuptools/__init__.py index dce80c0..5a2271a 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -6,13 +6,20 @@ class SetupException(Exception): def __str__(self): return "Seems like config.cfg has not been created yet. Run setup.py to do so." -def getSetting(section, setting): - config = configparser.RawConfigParser() - config.read(conffile) - return config.get(section, setting) +def getSetting(section, setting, exception = False): + try: + config = configparser.RawConfigParser() + config.read(conffile) + return config.get(section, setting) + except: + if exception: + raise SetupException() + return None -def getListSetting(section, setting): +def getListSetting(section, setting, exception = False): config = configparser.RawConfigParser() config.read(conffile) lit = config.get(section, setting) + if lit == None and exception: + raise SetupException() return ast.literal_eval(lit) diff --git a/twitools/__init__.py b/twitools/__init__.py index 10ec0ca..956e4ca 100644 --- a/twitools/__init__.py +++ b/twitools/__init__.py @@ -1,28 +1,16 @@ import setuptools, tweepy def cke(): - try: - return setuptools.getSetting("Twitter", "cke") - except: - raise setuptools.SetupException() + return setuptools.getSetting("Twitter", "cke", True) def cse(): - try: - return setuptools.getSetting("Twitter", "cse") - except: - raise setuptools.SetupException() + return setuptools.getSetting("Twitter", "cse", True) def ato(): - try: - return setuptools.getSetting("Twitter", "ato") - except: - raise setuptools.SetupException() + return setuptools.getSetting("Twitter", "ato", True) def ase(): - try: - return setuptools.getSetting("Twitter", "ase") - except: - raise setuptools.SetupException() + return setuptools.getSetting("Twitter", "ase", True) def user(): return twObject().whoami()