chan os.Signal should be buffered

[goircd.git] / goircd.go

diff --git a/goircd.go b/goircd.go
index f8aad490d8a47b44f900c022ea9ee7adb7e37bdd..52891782bcff3f74055a83b6c8a682a2a489c6c7 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package main
 import (
        "crypto/tls"
        "flag"
-       "io/ioutil"
        "log"
        "net"
        "os"
@@ -33,7 +32,7 @@ import (
 )
 
 const (
-       Version = "1.9.0"
+       Version = "1.9.1"
 
        StateTopicFilename = "topic"
        StateKeyFilename   = "key"
@@ -144,7 +143,7 @@ func main() {
                        log.Fatalln("can not read statedir", err)
                }
                for _, state := range states {
-                       buf, err := ioutil.ReadFile(path.Join(state, StateTopicFilename))
+                       buf, err := os.ReadFile(path.Join(state, StateTopicFilename))
                        if err != nil {
                                log.Fatalf(
                                        "can not read state %s/%s: %v",
@@ -153,7 +152,7 @@ func main() {
                        }
                        room := RoomRegister(path.Base(state))
                        room.topic = strings.TrimRight(string(buf), "\n")
-                       buf, err = ioutil.ReadFile(path.Join(state, StateKeyFilename))
+                       buf, err = os.ReadFile(path.Join(state, StateKeyFilename))
                        if err == nil {
                                room.key = strings.TrimRight(string(buf), "\n")
                        } else {
@@ -178,7 +177,7 @@ func main() {
                                }
 
                                topicPath := path.Join(statePath, StateTopicFilename)
-                               if err := ioutil.WriteFile(
+                               if err := os.WriteFile(
                                        topicPath,
                                        []byte(event.topic+"\n"),
                                        permStateFile,
@@ -188,7 +187,7 @@ func main() {
                                }
 
                                keyPath := path.Join(statePath, StateKeyFilename)
-                               if err := ioutil.WriteFile(
+                               if err := os.WriteFile(
                                        keyPath,
                                        []byte(event.key+"\n"),
                                        permStateFile,
@@ -221,7 +220,7 @@ func main() {
        }
        log.Println("goircd", Version, "started")
 
-       needsShutdown := make(chan os.Signal, 0)
+       needsShutdown := make(chan os.Signal, 1)
        signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
        go func() {
                <-needsShutdown