Changeset 507 in code for trunk

Timestamp:

Apr 21, 2021, 4:15:04 PM (4 years ago)

Author:

contact

Message:

Make db and log config options more future-proof

Rename the "sql" directive to "db". Rename the "log" directive to
"log fs".

In the future, we'll maybe support more databases and more message
stores. Make it so it's easy to integrate these new festures to the
config file format.

Location:

trunk

Files:

• config.in (modified) (1 diff)
• config/config.go (modified) (1 diff)
• doc/soju.1.scd (modified) (1 diff)

trunk/config.in

@@ -1 @@
-sql sqlite3 /var/lib/soju/main.db
-log /var/lib/soju/logs/
+db sqlite3 /var/lib/soju/main.db
+log fs /var/lib/soju/logs/

trunk/config/config.go

@@ -87 +87 @@
                         }
                         srv.TLS = tls
-                case "sql":
+                case "db":
                         if err := d.ParseParams(&srv.SQLDriver, &srv.SQLSource); err != nil {
                                 return nil, err
                         }
                 case "log":
-                        if err := d.ParseParams(&srv.LogPath); err != nil {
+                        var driver string
+                        if err := d.ParseParams(&driver, &srv.LogPath); err != nil {
                                 return nil, err
+                        }
+                        if driver != "fs" {
+                                return nil, fmt.Errorf("directive %q: unknown driver %q", d.Name, driver)
                         }
                 case "http-origin":

trunk/doc/soju.1.scd

@@ -102 +102 @@
         Enable TLS support. The certificate and the key files must be PEM-encoded.
 
-*sql* <driver> <source>
-        Set the SQL driver settings. The only supported driver is "sqlite3". The
-        source is the path to the SQLite database file. By default, the path to the
-        database file is "soju.db".
-
-*log* <path>
+*db* sqlite3 <path>
+        Set the SQLite database path (default: "soju.db" in the current directory).
+
+*log* fs <path>
         Path to the bouncer logs root directory, or empty to disable logging. By
         default, logging is disabled.