- Bot now takes shard id (optional) and total shards (optional) command line arguments (changed from shard id and parent process id)

- Sharding with coordinator now works properly - Documented creds.yml RestartCommand - it has no effect when coordinator is starting the bot - Regenerated creds_example.yml - Removed all db migrators as the v3 requires the user to have updated 2.x all the way - TotalShards in creds.yml gets overriden by coord.yml's TotalShards if the bot is ran through coordinator (more precisely, by the command line argument to the bot) - Coordinator now runs on http://localhost:3442 by default, you can change this in appsettings.json - This is done because of macos https issues - Primarily because https for regular users is a massive hassle. Coordinator shouldn't be exposed anyway - Minor cleanup
2025-09-11 01:38:27 -04:00 · 2021-06-25 19:14:34 +02:00
parent a1ef862382
commit 670b0aca96
14 changed files with 119 additions and 398 deletions
--- a/src/NadekoBot/Services/Impl/BotCredsProvider.cs
+++ b/src/NadekoBot/Services/Impl/BotCredsProvider.cs
@@ -0,0 +1,96 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using System.IO;
+using Microsoft.Extensions.Primitives;
+using Nadeko.Common;
+using NadekoBot.Common;
+using NadekoBot.Common.Yml;
+using Serilog;
+
+namespace NadekoBot.Services
+{
+    // todo check why is memory usage so unstable
+    public class BotCredsProvider
+    {
+        private readonly int? _totalShards;
+        private const string _credsFileName = "creds.yml";
+        private string CredsPath => Path.Combine(Directory.GetCurrentDirectory(), _credsFileName);
+        private const string _credsExampleFileName = "creds_example.yml";
+        private string CredsExamplePath => Path.Combine(Directory.GetCurrentDirectory(), _credsExampleFileName);
+        
+        private string _oldCredsJsonFilename = Path.Combine(Directory.GetCurrentDirectory(), "credentials.json");
+
+        private Creds _creds = new Creds();
+        private IConfigurationRoot _config;
+
+        private readonly object reloadLock = new object();
+        private void Reload()
+        {
+            lock (reloadLock)
+            {
+                _creds.OwnerIds.Clear();
+                _config.Bind(_creds);
+                
+                if (string.IsNullOrWhiteSpace(_creds.Token))
+                {
+                    Log.Error("Token is missing from credentials.json or Environment variables.\n" +
+                              "Add it and restart the program.");
+                    Helpers.ReadErrorAndExit(5);
+                    return;
+                }
+                
+                if (string.IsNullOrWhiteSpace(_creds.RestartCommand?.Cmd)
+                    || string.IsNullOrWhiteSpace(_creds.RestartCommand?.Args))
+                {
+                    if (Environment.OSVersion.Platform == PlatformID.Unix)
+                    {
+                        _creds.RestartCommand = new RestartConfig()
+                        {
+                            Args = "dotnet",
+                            Cmd = "NadekoBot.dll -- {0}",
+                        };
+                    }
+                    else
+                    {
+                        _creds.RestartCommand = new RestartConfig()
+                        {
+                            Args = "NadekoBot.exe",
+                            Cmd = "{0}",
+                        };
+                    }
+                }
+
+                _creds.TotalShards = _totalShards ?? _creds.TotalShards;
+            }
+        }
+
+        public BotCredsProvider(int? totalShards = null)
+        {
+            _totalShards = totalShards;
+            if (!File.Exists(CredsExamplePath))
+            {
+                File.WriteAllText(CredsExamplePath, Yaml.Serializer.Serialize(_creds));
+            }
+            
+            if (!File.Exists(CredsPath))
+            {
+                Log.Warning($"{CredsPath} is missing. " +
+                            $"Attempting to load creds from environment variables prefixed with 'NadekoBot_'. " +
+                            $"Example is in {CredsExamplePath}");
+            }
+            
+            _config = new ConfigurationBuilder()
+                .AddYamlFile(CredsPath, false, true)
+                .AddEnvironmentVariables("NadekoBot_")
+                .Build();
+            
+            ChangeToken.OnChange(
+                () => _config.GetReloadToken(),
+                Reload);
+            
+            Reload();
+        }
+        
+        public Creds GetCreds() => _creds;
+    }
+}