Implement counting keyword events and a unified buffers system for when the master channel is unavailable

This commit is contained in:
2018-03-04 17:25:57 +00:00
parent eae4315562
commit da6c45f093
16 changed files with 60 additions and 19 deletions

View File

@@ -7,10 +7,8 @@ from twisted.internet.ssl import DefaultOpenSSLContextFactory
#log.startLogging(stdout)
from core.main import (
numbers,
configPath,
certPath,
listener,
connections,
IRCPool,
ReactorPool,
@@ -37,12 +35,7 @@ import modules.userinfo as userinfo
import core.helper as helper
from core.server import Server, ServerFactory
if __name__ == "__main__":
for i in pool.keys():
if pool[i]["enabled"] == True:
helper.addBot(i)
listener = ServerFactory()
if config["Listener"]["UseSSL"] == True:
reactor.listenSSL(config["Listener"]["Port"], listener, DefaultOpenSSLContextFactory(certPath+config["Listener"]["Key"], certPath+config["Listener"]["Certificate"]), interface=config["Listener"]["Address"])
@@ -50,5 +43,8 @@ if __name__ == "__main__":
else:
reactor.listenTCP(config["Listener"]["Port"], listener, interface=config["Listener"]["Address"])
log("Threshold running on %s:%s" % (config["Listener"]["Address"], config["Listener"]["Port"]))
for i in pool.keys():
if pool[i]["enabled"] == True:
helper.addBot(i)
reactor.run()