Browse Source
giving an option to easily config redis host/port
pull/1/head
sirgje
3 years ago
No known key found for this signature in database
GPG Key ID: 9F326B1EC4A97073
3 changed files with
8 additions and
5 deletions
-
bot.py
-
cogs/utils/esi.py
-
config.py.example
|
|
@ -17,7 +17,6 @@ except ImportError: |
|
|
|
print("Config not found, have you copied over the example settings?") |
|
|
|
sys.exit(1) |
|
|
|
|
|
|
|
|
|
|
|
description = """ |
|
|
|
Rooster knows all... |
|
|
|
""" |
|
|
@ -28,7 +27,7 @@ initial_cogs = ( |
|
|
|
"cogs.about", |
|
|
|
"cogs.who", |
|
|
|
"cogs.insurance", |
|
|
|
#"cogs.market", |
|
|
|
# "cogs.market", |
|
|
|
"cogs.mute", |
|
|
|
"cogs.reminder", |
|
|
|
"cogs.time", |
|
|
@ -59,7 +58,8 @@ class Rooster(commands.Bot): |
|
|
|
self.zk = zKillSocket(self.kill_queue) |
|
|
|
self.zk.start() |
|
|
|
self.redis = None |
|
|
|
self.redis = self.loop.run_until_complete(aioredis.create_pool(("localhost", 6379), minsize=5, maxsize=10)) |
|
|
|
self.redis = self.loop.run_until_complete( |
|
|
|
aioredis.create_pool((config.redis_host, config.redis_port), minsize=5, maxsize=10)) |
|
|
|
print('redis pool started', self.redis) |
|
|
|
self.client_id = config.client_id |
|
|
|
self.session = aiohttp.ClientSession(loop=self.loop) |
|
|
|
|
|
@ -14,7 +14,7 @@ class SwaggerError(Exception): |
|
|
|
|
|
|
|
class ESI: |
|
|
|
def __init__(self): |
|
|
|
r = redis.StrictRedis(host="localhost", port=6379, db=1) |
|
|
|
r = redis.StrictRedis(host=config.redis_host, port=config.redis_port, db=1) |
|
|
|
self.cache = RedisCache(r) |
|
|
|
self.esi = EsiPysi( |
|
|
|
"https://esi.evetech.net/_latest/swagger.json?datasource=tranquility", |
|
|
|
|
|
@ -7,4 +7,7 @@ opencage_key = '' #api token for opencage data (geocoding) |
|
|
|
#evedev app variables |
|
|
|
redirect = '' |
|
|
|
esiclient_id = '' |
|
|
|
secret_key = '' |
|
|
|
secret_key = '' |
|
|
|
|
|
|
|
redis_host = 'localhost' |
|
|
|
redis_port = 6379 |
|
|
|