X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=events.go;h=283b5f76d5039ba03fa0e1f2b2cbefced7f877cd;hp=843e8b59d8b407d2e96de3e334d77afab4219d80;hb=def58d0f4944397faa8cdd4a9cf3515125e0b548;hpb=b67868201041359c456457b62910866a8e072b2b

diff --git a/events.go b/events.go
index 843e8b5..283b5f7 100644
--- a/events.go
+++ b/events.go
@@ -1,11 +1,10 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2020 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,10 +33,17 @@ const (
 	EventTopic = iota
 	EventWho   = iota
 	EventMode  = iota
+	EventTerm  = iota
+	EventTick  = iota
 	FormatMsg  = "[%s] <%s> %s\n"
 	FormatMeta = "[%s] * %s %s\n"
 )
 
+var (
+	logSink   chan LogEvent   = make(chan LogEvent)
+	stateSink chan StateEvent = make(chan StateEvent)
+)
+
 // Client events going from each of client
 // They can be either NEW, DEL or unparsed MSG
 type ClientEvent struct {
@@ -66,9 +72,12 @@ func Logger(logdir string, events <-chan LogEvent) {
 	mode := os.O_CREATE | os.O_WRONLY | os.O_APPEND
 	perm := os.FileMode(0660)
 	var format string
+	var logfile string
+	var fd *os.File
+	var err error
 	for event := range events {
-		logfile := path.Join(logdir, event.where)
-		fd, err := os.OpenFile(logfile, mode, perm)
+		logfile = path.Join(logdir, event.where+".log")
+		fd, err = os.OpenFile(logfile, mode, perm)
 		if err != nil {
 			log.Println("Can not open logfile", logfile, err)
 			continue
@@ -96,10 +105,13 @@ type StateEvent struct {
 // Room states shows that either topic or key has been changed
 // Each room's state is written to separate file in statedir
 func StateKeeper(statedir string, events <-chan StateEvent) {
+	var fn string
+	var data string
+	var err error
 	for event := range events {
-		fn := path.Join(statedir, event.where)
-		data := event.topic + "\n" + event.key + "\n"
-		err := ioutil.WriteFile(fn, []byte(data), os.FileMode(0660))
+		fn = path.Join(statedir, event.where)
+		data = event.topic + "\n" + event.key + "\n"
+		err = ioutil.WriteFile(fn, []byte(data), os.FileMode(0660))
 		if err != nil {
 			log.Printf("Can not write statefile %s: %v", fn, err)
 		}