Skip to content

Commit 7b74930

Browse files
committed
CHANGES:
- ModManager: remote call timeouts increased to 3 mins
1 parent c3d3beb commit 7b74930

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Scripts/net/DCSServerBot/DCSServerBot.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ end
3434

3535
dcsbot.sendBotTable = dcsbot.sendBotTable or function (tbl, channel)
3636
tbl.server_name = cfg.name
37-
tbl.channel = channel or "-1"
37+
tbl.channel = tostring(channel or "-1")
3838
socket.try(dcsbot.UDPSendSocket:sendto(net.lua2json(tbl), config.BOT_HOST, config.BOT_PORT))
3939
end
4040

Scripts/net/DCSServerBot/DCSServerBotUtils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function sendBotTable(tbl, channel)
3333
server_name = loadSettingsRaw().name
3434
end
3535
tbl.server_name = server_name
36-
tbl.channel = channel or "-1"
36+
tbl.channel = tostring(channel or "-1")
3737
socket.try(UDPSendSocket:sendto(net.lua2json(tbl), config.BOT_HOST, config.BOT_PORT))
3838
end
3939

core/utils/discord.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def check_roles(roles: Iterable[str | int], member: discord.Member | None = None
395395
:param member: The discord.Member object to check roles for. Defaults to None.
396396
:return: A boolean value indicating whether the member has any of the specified roles. Returns False if member is None.
397397
"""
398-
if not member:
398+
if not member or not isinstance(member, discord.Member):
399399
return False
400400
for role in member.roles:
401401
for valid_role in roles:

extensions/lardoon/extension.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import psutil
55
import subprocess
66

7-
from core import Extension, Server, utils, get_translation, PortType, Port
7+
from core import Extension, Server, utils, get_translation, PortType, Port, ThreadSafeDict
88
from discord.ext import tasks
99
from threading import Thread
1010
from typing_extensions import override
@@ -21,7 +21,7 @@
2121
class Lardoon(Extension):
2222
_process: psutil.Process | None = None
2323
_servers: set[str] = set()
24-
_tacview_dirs: dict[str, set[str]] = {}
24+
_tacview_dirs: dict[str, set[str]] = ThreadSafeDict()
2525
_lock = asyncio.Lock()
2626

2727
CONFIG_DICT = {

services/modmanager/service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def backup(p, names) -> list[str]:
398398
self.log.info(f"- Package {package_name}_v{version} successfully installed in {target}.")
399399
return True
400400

401-
@proxy
401+
@proxy(timeout=180)
402402
async def install_package(self, server: Server, folder: Folder | str, package_name: str, version: str,
403403
repo: str | None = None) -> bool:
404404
self.log.info(f"Installing package {package_name}_v{version} ...")
@@ -456,7 +456,7 @@ async def do_uninstall(self, reference: Server | Node, folder: Folder, package_n
456456
self.log.info(f"- Package {package_name}_v{version} successfully removed.")
457457
return True
458458

459-
@proxy
459+
@proxy(timeout=180)
460460
async def uninstall_package(self, server: Server, folder: Folder | str, package_name: str,
461461
version: str) -> bool:
462462
if isinstance(folder, str):

0 commit comments

Comments
 (0)