Changeset 147 in code for trunk/config

Timestamp:

Mar 18, 2024, 1:23:54 AM (15 months ago)

Author:

Izuru Yakumo

Message:

コードのリファクタリングが完了しました

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

File:

• trunk/config/config.go (modified) (2 diffs)

trunk/config/config.go

@@ -2 +2 @@
 
 import (
-        "os"
+        "gopkg.in/ini.v1"
 )
 
-type Config struct {
+var Config struct {
         Debug          bool
         ListenAddress  string
@@ -17 +17 @@
 }
 
-var DefaultConfig *Config
+func readConfig(file string) error {
+        cfg, err := ini.Load(file)
+        if err != nil {
+                return err
+        }
+        Config.Debug, _ = cfg.Section("yukari").Key("debug").Bool()
+        Config.ListenAddress = cfg.Section("yukari").Key("listen").String()
+        Config.Key = cfg.Section("yukari").Key("key").String()
+        Config.IPV6, _ = cfg.Section("yukari").Key("ipv6").Bool()
+        Config.RequestTimeout, _ = cfg.Section("yukari").Key("timeout").Uint()
+        Config.FollowRedirect, _ = cfg.Section("yukari").Key("followredirect").Bool()
+        Config.MaxConnsPerHost, _ = cfg.Section("yukari").Key("max_conns_per_host").Uint()
+        Config.UrlParameter = cfg.Section("yukari").Key("urlparam").String()
+        Config.HashParameter = cfg.Section("yukari").Key("hashparam").String()
 
-func init() {
-        default_listen_addr := os.Getenv("YUKARI_ADDRESS")
-        if default_listen_addr == "" {
-                default_listen_addr = "127.0.0.1:3000"
-        }
-        default_url_parameter := os.Getenv("YUKARI_URL_PARAM")
-        if default_url_parameter == "" {
-                default_url_parameter = "yukariurl"
-        }
-        default_hash_parameter := os.Getenv("YUKARI_HASH_PARAM")
-        if default_hash_parameter == "" {
-                default_hash_parameter = "yukarihash"
-        }
-        default_key := os.Getenv("YUKARI_KEY")
-        DefaultConfig = &Config{
-                Debug:          os.Getenv("DEBUG") != "false",
-                ListenAddress:  default_listen_addr,
-                Key:            default_key,
-                IPV6:           true,
-                RequestTimeout: 5,
-                FollowRedirect: false,
-                MaxConnsPerHost: 4,
-                UrlParameter: default_url_parameter,
-                HashParameter: default_hash_parameter,
-        }
+        return nil
 }