log on resetting in debug mode

README.md

@@ -1,3 +1,3 @@
 # mcserver-discordbot
 
-Currenlty in development. Readme will follow soon.
+Currently in development. Readme will follow soon.

bot/config/settings-example.ini

@@ -22,7 +22,7 @@
 # the better option is to wait up to an hour (discords regulation) and let the bot
 # create the slash commands globally
 # enter multiple guild ids by separating them with space
-debug_guilds = 848137923101982741 958692739065720832 418447236008116228
+; debug_guilds =
 
 [systemd]
 ; service_name = mc-status-bot

bot/extensions/admin.py

@@ -26,7 +26,7 @@ class Admin(discord.Cog):
 
     @__dev_group.command(name='update')
     async def __update_bot(self, ctx: discord.ApplicationContext) -> None:
-        await ctx.respond('starting update...')
+        await ctx.defer()
 
         if 0 == await self.bot.execute_shell('update.sh'):
             await ctx.respond('Updated bot from https://github.com/Specoolazius/mcserver-discordbot\n'
@@ -39,5 +39,8 @@ class Admin(discord.Cog):
     @__dev_group.command(name='restart')
     async def __restart_service(self, ctx: discord.ApplicationContext) -> None:
         await ctx.respond('attempting restart...')
-        await asyncio.create_subprocess_shell(f'sudo systemctl restart')
+        self.bot.logger.info('Restarting bot...')
+
+        process = await asyncio.create_subprocess_shell(cmd=f'sudo systemctl restart {self.bot.config.service_name}')
+        # await process.communicate()
 

bot/extensions/startstop.py

@@ -3,6 +3,7 @@ Project is under GNU GENERAL PUBLIC LICENSE 3.0
 
 2022, created by Specoolazius
 """
+import os.path
 
 import discord
 from discord.commands import slash_command
@@ -21,4 +22,27 @@ class StartStop(discord.Cog):
 
     @slash_command(name='start')
     async def __execute_start(self, ctx: discord.ApplicationContext) -> None:
-        pass
+        await ctx.defer()
+        self.bot.is_server_starting = True
+
+        try:
+            returncode = await self.bot.execute_shell('start.sh')
+            self.bot.logger.info(f'Executed start.sh with exit code {returncode}')
+
+        except Exception as e:
+            self.bot.logger.error(
+                f'Failed to run start.sh\n'
+                f'Error: {e}'
+            )
+            await ctx.respond(
+                f'Failed to execute start.sh\n'
+                f'Check {os.path.join(self.bot.config.log_path, "discord.log")} for more detailed information'
+            )
+
+        else:
+            await ctx.respond('Server is starting')
+
+    @slash_command(name='stop')
+    async def __execute_stop(self, ctx: discord.ApplicationContext) -> None:
+        await ctx.defer()
+        await ctx.respond('Not implemented yet')

bot/libs/client.py

@@ -156,25 +156,27 @@ class Client(discord.Bot, ABC):
             await process_chmod.communicate()
             return process_chmod.returncode
 
-        process = await asyncio.create_subprocess_exec(
-            program=os.path.join(os.getcwd(), SHELL_SCRIPT_PATH, file_name),
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
+        if not retry:
+            await __grant_permission()
 
-        stdout, stderr = await process.communicate()
-        self.logger.info(f'Executed script {file_name} with exit code {process.returncode}')
+        try:
+            process = await asyncio.create_subprocess_exec(
+                program=os.path.join(os.getcwd(), SHELL_SCRIPT_PATH, file_name),
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
 
-        if process.returncode == 0:
-            self.logger.info(f'stdout:\n{stdout.decode()}')
+            stdout, stderr = await process.communicate()
+            self.logger.info(f'Executed script {file_name} with exit code {process.returncode}')
 
-        # bash returncode 126: permission error
-        elif process.returncode == 126 and retry:
+            if process.returncode == 0:
+                self.logger.info(f'stdout:\n{stdout.decode()}')
+            else:
+                self.logger.error(f'stderr:\n{stderr.decode()}')
+
+            return process.returncode
+
+        except PermissionError:
             # retrying once
             self.logger.warning(f'Missing permissions for {file_name}')
             return await self.execute_shell(file_name, retry=False)
-
-        else:
-            self.logger.error(f'stderr:\n{stderr.decode()}')
-
-        return process.returncode

bot/libs/presence.py

@@ -58,6 +58,8 @@ class Presence(object):
             if self.bot.is_server_starting and self.bot.last_start + self.bot.config.server_start_timout < time.time():
                 self.bot.is_server_starting = False
 
+                self.bot.logger.debug('Resetting is_starting to False')
+
             # ToDo: better presence
             await self.bot.change_presence(
                 activity=discord.Activity(

bot/run.sh

@@ -4,5 +4,5 @@
 #
 # 2022, created by Specoolazius
 
-cd ~/mcserver-discordbot/bot || exit;
-sudo python3.10 -O run.py
+cd /root/mcserver-discordbot/bot || exit;
+python3 -O run.py

bot/scripts/update.sh

@@ -8,3 +8,4 @@
 
 git stash
 git pull --rebase origin
+

mc-status-bot.service

@@ -6,7 +6,7 @@ Requires=network.target
 
 [Service]
 Type=idle
-ExecStart=~/mcserver-discordbot/bot/run.sh
+ExecStart=chmod +x /root/mcserver-discordbot/bot/run.sh && /root/mcserver-discordbot/bot/run.sh
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target