Skip to content

Commit 30cf2f8

Browse files
committed
Added some prechecks
1 parent 6811178 commit 30cf2f8

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

extensions/realweather/extension.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,16 @@ async def generate_config(self, filename: str, tmpname: str, config: dict | None
195195
async def run_realweather(self, filename: str, tmpname: str) -> tuple[str, bool]:
196196
try:
197197
cwd = await self.server.get_missions_dir()
198-
rw_home = os.path.expandvars(self.config['installation'])
199198

200-
def cleanup(cwd: str):
199+
def cleanup():
201200
# delete the mission_unpacked directory which might still be there from former RW runs
202201
mission_unpacked_dir = os.path.join(cwd, 'mission_unpacked')
203202
if os.path.exists(mission_unpacked_dir):
204203
utils.safe_rmtree(mission_unpacked_dir)
205204

206205
def run_subprocess():
207206
# double-check that no mission_unpacked dir is there
208-
cleanup(cwd)
207+
cleanup()
209208
# run RW
210209
process = subprocess.Popen(
211210
[self.get_rw_exe()],
@@ -240,7 +239,7 @@ def run_subprocess():
240239
try:
241240
await asyncio.to_thread(run_subprocess)
242241
finally:
243-
cleanup(cwd)
242+
cleanup()
244243

245244
# check if DCS Real Weather corrupted the miz file
246245
await asyncio.to_thread(MizFile, tmpname)

plugins/admin/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ async def cleanup(self):
14151415
await conn.execute("DELETE FROM nodestats WHERE time < (CURRENT_TIMESTAMP - interval '1 month')")
14161416

14171417
@cleanup.before_loop
1418-
async def before_check_unban(self):
1418+
async def before_cleanup(self):
14191419
await self.bot.wait_until_ready()
14201420

14211421

plugins/mission/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,7 @@ async def expire_token(self):
20012001
""")
20022002

20032003
@expire_token.before_loop
2004-
async def before_check_unban(self):
2004+
async def before_expire(self):
20052005
await self.bot.wait_until_ready()
20062006

20072007
@tasks.loop(minutes=1.0)

plugins/restapi/commands.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,10 @@ async def refresh_views(self):
937937
REFRESH MATERIALIZED VIEW mv_serverstats;
938938
""")
939939

940+
@refresh_views.before_loop
941+
async def before_refresh_views(self):
942+
await self.bot.wait_until_ready()
943+
940944

941945
async def setup(bot: DCSServerBot):
942946
await bot.add_cog(RestAPI(bot))

plugins/userstats/commands.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,10 @@ async def refresh_views(self):
838838
REFRESH MATERIALIZED VIEW mv_statistics;
839839
""")
840840

841+
@refresh_views.before_loop
842+
async def before_refresh_views(self):
843+
await self.bot.wait_until_ready()
844+
841845
@commands.Cog.listener()
842846
async def on_member_remove(self, member):
843847
if self.get_config().get('wipe_stats_on_leave', True):

0 commit comments

Comments
 (0)