diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 152 |
1 files changed, 36 insertions, 116 deletions
@@ -47,108 +47,6 @@ var ( errUnsupportedType = errors.New("unsupported type") ) -func addSaneDefaults(config *TomlConfig) { - if config.IrcNick == "" { - config.IrcNick = "milla" - } - - if config.ChromaStyle == "" { - config.ChromaStyle = "rose-pine-moon" - } - - if config.ChromaFormatter == "" { - config.ChromaFormatter = "noop" - } - - if config.DatabaseAddress == "" { - config.DatabaseAddress = "postgres" - } - - if config.DatabaseUser == "" { - config.DatabaseUser = "milla" - } - - if config.DatabaseName == "" { - config.DatabaseName = "milladb" - } - - if config.Temperature == 0 { - config.Temperature = 0.5 - } - - if config.RequestTimeout == 0 { - config.RequestTimeout = 10 - } - - if config.MillaReconnectDelay == 0 { - config.MillaReconnectDelay = 30 - } - - if config.IrcPort == 0 { - config.IrcPort = 6697 - } - - if config.KeepAlive == 0 { - config.KeepAlive = 600 - } - - if config.MemoryLimit == 0 { - config.MemoryLimit = 20 - } - - if config.PingDelay == 0 { - config.PingDelay = 20 - } - - if config.PingTimeout == 0 { - config.PingTimeout = 20 - } - - if config.OllamaMirostatEta == 0 { - config.OllamaMirostatEta = 0.1 - } - - if config.OllamaMirostatTau == 0 { - config.OllamaMirostatTau = 5.0 - } - - if config.OllamaNumCtx == 0 { - config.OllamaNumCtx = 4096 - } - - if config.OllamaRepeatLastN == 0 { - config.OllamaRepeatLastN = 64 - } - - if config.OllamaRepeatPenalty == 0 { - config.OllamaRepeatPenalty = 1.1 - } - - if config.OllamaSeed == 0 { - config.OllamaSeed = 42 - } - - if config.OllamaNumPredict == 0 { - config.OllamaNumPredict = -1 - } - - if config.TopK == 0 { - config.TopK = 40 - } - - if config.TopP == 0.0 { - config.TopP = 0.9 - } - - if config.OllamaMinP == 0 { - config.OllamaMinP = 0.05 - } - - if config.Temperature == 0 { - config.Temperature = 0.7 - } -} - func getTableFromChanName(channel, ircdName string) string { tableName := ircdName + "_" + channel tableName = strings.ReplaceAll(tableName, "#", "") @@ -585,7 +483,7 @@ func runCommand( appConfig.deleteLstate(args[1]) case "remind": if len(args) < 2 { //nolint: mnd,gomnd - client.Cmd.Reply(event, errNotEnoughArgs.Error()) + client.Cmd.Message(event.Source.Name, errNotEnoughArgs.Error()) break } @@ -593,14 +491,15 @@ func runCommand( seconds, err := strconv.Atoi(args[1]) if err != nil { client.Cmd.Reply(event, errNotEnoughArgs.Error()) + client.Cmd.Message(event.Source.Name, errNotEnoughArgs.Error()) break } - client.Cmd.Reply(event, "Ok, I'll remind you in "+args[1]+" seconds.") + client.Cmd.Message(event.Source.Name, "Ok, I'll remind you in "+args[1]+" seconds.") time.Sleep(time.Duration(seconds) * time.Second) - client.Cmd.ReplyTo(event, " Ping!") + client.Cmd.Message(event.Source.Name, "Ping!") case "forget": client.Cmd.Reply(event, "I no longer even know whether you're supposed to wear or drink a camel.'") case "whois": @@ -1221,7 +1120,14 @@ func connectToDB(appConfig *TomlConfig, ctx *context.Context, irc *girc.Client) return pgxpool.NewWithConfig(*ctx, poolConfig) } - pool, err = backoff.Retry(*ctx, dbConnect, backoff.WithBackOff(backoff.NewExponentialBackOff())) + expBackoff := backoff.WithBackOff(&backoff.ExponentialBackOff{ + InitialInterval: time.Millisecond * time.Duration(appConfig.DbBackOffInitialInterval), + RandomizationFactor: appConfig.DbBackOffRandomizationFactor, + Multiplier: appConfig.DbBackOffMultiplier, + MaxInterval: time.Second * time.Duration(appConfig.DbBackOffMaxInterval), + }) + + pool, err = backoff.Retry(*ctx, dbConnect, expBackoff) if err != nil { LogError(err) } @@ -1475,6 +1381,8 @@ func runIRC(appConfig TomlConfig) { go LoadAllPlugins(&appConfig, irc) + go LoadAllEventPlugins(&appConfig, irc) + if appConfig.DatabaseAddress != "" { context, cancel := context.WithTimeout(context.Background(), time.Duration(appConfig.RequestTimeout)*time.Second) defer cancel() @@ -1541,11 +1449,20 @@ func runIRC(appConfig TomlConfig) { ctx, cancel := context.WithTimeout(context.Background(), time.Duration(appConfig.MillaReconnectDelay)*time.Second) defer cancel() - _, err := backoff.Retry(ctx, connectToIRC, backoff.WithBackOff(backoff.NewExponentialBackOff())) - if err != nil { - LogError(err) - } else { - return + for { + expBackoff := backoff.WithBackOff(&backoff.ExponentialBackOff{ + InitialInterval: time.Millisecond * time.Duration(appConfig.IrcBackOffInitialInterval), + RandomizationFactor: appConfig.IrcBackOffRandomizationFactor, + Multiplier: appConfig.IrcBackOffMultiplier, + MaxInterval: time.Second * time.Duration(appConfig.IrcBackOffMaxInterval), + }) + + _, err := backoff.Retry(ctx, connectToIRC, expBackoff) + if err != nil { + LogError(err) + } else { + return + } } } @@ -1560,6 +1477,7 @@ func main() { signal.Notify(quitChannel, syscall.SIGINT, syscall.SIGTERM) configPath := flag.String("config", "./config.toml", "path to the config file") + prof := flag.Bool("prof", false, "enable prof server") flag.Parse() @@ -1576,7 +1494,7 @@ func main() { } for key, value := range config.Ircd { - addSaneDefaults(&value) + AddSaneDefaults(&value) value.IRCDName = key config.Ircd[key] = value } @@ -1589,10 +1507,12 @@ func main() { go runIRC(v) } - go func() { - err := http.ListenAndServe(":6060", nil) - log.Println(err) - }() + if *prof { + go func() { + err := http.ListenAndServe(":6060", nil) + log.Println(err) + }() + } <-quitChannel } |