kumi/kumistatus
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Return None when getSetting() fails

Browse source
This commit is contained in:
Klaus-Uwe Mitterer 2016-07-20 19:30:51 +02:00
parent 780df5abc1
commit eae9d81f2a
3 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server.py
View file

@ -4,12 +4,14 @@ import setuptools, servertools, socketserver, syslog, threading
if __name__ == "__main__": if __name__ == "__main__":
socketserver.TCPServer.allow_reuse_address = True 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: try:
server = servertools.TCPServer((setuptools.getSetting("Server", "bind"), int(setuptools.getSetting("Server", "port"))), servertools.TCPHandler) server = servertools.TCPServer((bind, port), servertools.TCPHandler)
except: 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.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: try:
thread = threading.Thread(target=server.serve_forever(), daemon=True) thread = threading.Thread(target=server.serve_forever(), daemon=True)

17
setuptools/__init__.py
View file

@ -6,13 +6,20 @@ class SetupException(Exception):
def __str__(self): def __str__(self):
return "Seems like config.cfg has not been created yet. Run setup.py to do so." return "Seems like config.cfg has not been created yet. Run setup.py to do so."
def getSetting(section, setting): def getSetting(section, setting, exception = False):
config = configparser.RawConfigParser() try:
config.read(conffile) config = configparser.RawConfigParser()
return config.get(section, setting) 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 = configparser.RawConfigParser()
config.read(conffile) config.read(conffile)
lit = config.get(section, setting) lit = config.get(section, setting)
if lit == None and exception:
raise SetupException()
return ast.literal_eval(lit) return ast.literal_eval(lit)

20
twitools/__init__.py
View file

@ -1,28 +1,16 @@
import setuptools, tweepy import setuptools, tweepy
def cke(): def cke():
try: return setuptools.getSetting("Twitter", "cke", True)
return setuptools.getSetting("Twitter", "cke")
except:
raise setuptools.SetupException()
def cse(): def cse():
try: return setuptools.getSetting("Twitter", "cse", True)
return setuptools.getSetting("Twitter", "cse")
except:
raise setuptools.SetupException()
def ato(): def ato():
try: return setuptools.getSetting("Twitter", "ato", True)
return setuptools.getSetting("Twitter", "ato")
except:
raise setuptools.SetupException()
def ase(): def ase():
try: return setuptools.getSetting("Twitter", "ase", True)
return setuptools.getSetting("Twitter", "ase")
except:
raise setuptools.SetupException()
def user(): def user():
return twObject().whoami() return twObject().whoami()