Changeset 152 in code for trunk

Timestamp:

Mar 24, 2024, 11:18:55 PM (15 months ago)

Author:

Izuru Yakumo

Message:

修理済み

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:

trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• cmd/yukari/main.go (modified) (1 diff)
• config/config.go (modified) (1 diff)

trunk/CHANGELOG.md

@@ +1 @@
+# v0.2.5 - 2024.03.24
+* Rename `config.readConfig` to `config.ReadConfig`
+* Assume default values if no `yukari.ini(5)` is loaded
+
 # v0.2.4 - 2024.03.24
 * Replace invalid favicon with one sourced from [here](https://en.touhouwiki.net/wiki/File:Th123YukariSigil.png), as well as using `//go:embed` for it

trunk/cmd/yukari/main.go

@@ -914 +914 @@
         flag.Parse()
 
-        config.Config.ListenAddress = "127.0.0.1:3000"
-        config.Config.Key = ""
-        config.Config.IPV6 = true
-        config.Config.Debug = false
-        config.Config.RequestTimeout = 5
-        config.Config.FollowRedirect = false
-        config.Config.UrlParameter = "yukariurl"
-        config.Config.HashParameter = "yukarihash"
-        config.Config.MaxConnsPerHost = 5
-        config.Config.ProxyEnv = false
+        if configFile != "" {
+                config.ReadConfig(configFile)
+        } else {
+                config.Config.ListenAddress = "127.0.0.1:3000"
+                config.Config.Key = ""
+                config.Config.IPV6 = true
+                config.Config.Debug = false
+                config.Config.RequestTimeout = 5
+                config.Config.FollowRedirect = false
+                config.Config.UrlParameter = "yukariurl"
+                config.Config.HashParameter = "yukarihash"
+                config.Config.MaxConnsPerHost = 5
+                config.Config.ProxyEnv = false
+        }
 
         if version {

trunk/config/config.go

@@ -18 +18 @@
 }
 
-func readConfig(file string) error {
+func ReadConfig(file string) error {
         cfg, err := ini.Load(file)
         if err != nil {