Changeset 804 in code for trunk/cmd

Timestamp:

Mar 21, 2023, 4:45:19 AM (2 years ago)

Author:

koizumi.aoi

Message:

Drunk as I like

Signed-off-by: Aoi K <koizumi.aoi@…>

Location:

trunk/cmd

Files:

• suika-znc-import/main.go (modified) (10 diffs)
• suika/main.go (modified) (7 diffs)
• suikactl/main.go (modified) (3 diffs)

trunk/cmd/suika-znc-import/main.go

@@ -17 +17 @@
 )
 
-const usage = `usage: soju-znc-import [options...] <znc config path>
+const usage = `usage: suika-znc-import [options...] <znc config path>
 
 Imports configuration from a ZNC file. Users and networks are merged if they
-already exist in the soju database. ZNC settings overwrite existing soju
+already exist in the suika database. ZNC settings overwrite existing suika
 settings.
 
@@ -26 +26 @@
 
   -help             Show this help message
-  -config <path>    Path to soju config file
+  -config <path>    Path to suika config file
   -user <username>  Limit import to username (may be specified multiple times)
   -network <name>   Limit import to network (may be specified multiple times)
@@ -65 +65 @@
         ctx := context.Background()
 
-        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)
@@ -87 +87 @@
                 log.Fatalf("failed to list users in DB: %v", err)
         }
-        existingUsers := make(map[string]*soju.User, len(l))
+        existingUsers := make(map[string]*suika.User, len(l))
         for i, u := range l {
                 existingUsers[u.Username] = &l[i]
@@ -108 +108 @@
                 } else {
                         // "!!" is an invalid crypt format, thus disables password auth
-                        u = &soju.User{Username: username, Password: "!!"}
+                        u = &suika.User{Username: username, Password: "!!"}
                         usersCreated++
                         log.Printf("user %q: creating new user", username)
@@ -124 +124 @@
                         log.Fatalf("failed to list networks for user %q: %v", username, err)
                 }
-                existingNetworks := make(map[string]*soju.Network, len(l))
+                existingNetworks := make(map[string]*suika.Network, len(l))
                 for i, n := range l {
                         existingNetworks[n.GetName()] = &l[i]
@@ -176 +176 @@
                                 logger.Printf("updating existing network")
                         } else {
-                                n = &soju.Network{Name: netName}
+                                n = &suika.Network{Name: netName}
                                 logger.Printf("creating new network")
                         }
@@ -195 +195 @@
                                 logger.Fatalf("failed to list channels: %v", err)
                         }
-                        existingChannels := make(map[string]*soju.Channel, len(l))
+                        existingChannels := make(map[string]*suika.Channel, len(l))
                         for i, ch := range l {
                                 existingChannels[ch.Name] = &l[i]
@@ -214 +214 @@
                                         logger.Printf("channel %q: updating existing channel", chName)
                                 } else {
-                                        ch = &soju.Channel{Name: chName}
+                                        ch = &suika.Channel{Name: chName}
                                         logger.Printf("channel %q: creating new channel", chName)
                                 }
@@ -233 +233 @@
 
         if usersCreated > 0 {
-                log.Printf("warning: user passwords haven't been imported, please set them with `sojuctl change-password <username>`")
+                log.Printf("warning: user passwords haven't been imported, please set them with `suikactl change-password <username>`")
         }
 

trunk/cmd/suika/main.go

@@ -60 +60 @@
 )
 
-func loadConfig() (*config.Server, *soju.Config, error) {
+func loadConfig() (*config.Server, *suika.Config, error) {
         var raw *config.Server
         if configPath != "" {
@@ -89 +89 @@
         }
 
-        cfg := &soju.Config{
+        cfg := &suika.Config{
                 Hostname:        raw.Hostname,
                 Title:           raw.Title,
@@ -124 +124 @@
         }
 
-        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)
@@ -138 +138 @@
         }
 
-        srv := soju.NewServer(db)
+        srv := suika.NewServer(db)
         srv.SetConfig(serverCfg)
-        srv.Logger = soju.NewLogger(log.Writer(), debug)
+        srv.Logger = suika.NewLogger(log.Writer(), debug)
 
         for _, listen := range cfg.Listen {
@@ -242 +242 @@
                 case "ident":
                         if srv.Identd == nil {
-                                srv.Identd = soju.NewIdentd()
+                                srv.Identd = suika.NewIdentd()
                         }
 
@@ -316 +316 @@
         }
 
-        if db, ok := db.(soju.MetricsCollectorDatabase); ok && srv.MetricsRegistry != nil {
+        if db, ok := db.(suika.MetricsCollectorDatabase); ok && srv.MetricsRegistry != nil {
                 srv.MetricsRegistry.MustRegister(db.MetricsCollector())
         }
@@ -345 +345 @@
 }
 
-func proxyProtoListener(ln net.Listener, srv *soju.Server) net.Listener {
+func proxyProtoListener(ln net.Listener, srv *suika.Server) net.Listener {
         return &proxyproto.Listener{
                 Listener: ln,

trunk/cmd/suikactl/main.go

@@ -16 +16 @@
 )
 
-const usage = `usage: sojuctl [-config path] <action> [options...]
+const usage = `usage: suikactl [-config path] <action> [options...]
 
   create-user <username> [-admin]  Create a new user
@@ -45 +45 @@
         }
 
-        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := suika.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)
@@ -74 +74 @@
                 }
 
-                user := soju.User{
+                user := suika.User{
                         Username: username,
                         Password: string(hashed),