Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/grumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOla Bini <ola@autonomia.digital>2020-03-26 17:04:14 +0300
committerOla Bini <ola@autonomia.digital>2020-03-26 17:04:14 +0300
commitdd6f383d3e57dd3fcd589e289a23ec5d3b292d5f (patch)
treeb7f5b7e949a10ced606140d22824222254ff4217 /cmd
parent8d351aedb06a96bc27093b2d75cc91788bebb067 (diff)
Rename the default logtarget to not stutter. Also hide the default file log target implementation
Diffstat (limited to 'cmd')
-rw-r--r--cmd/grumble/grumble.go4
-rw-r--r--cmd/grumble/server.go2
-rw-r--r--cmd/grumble/signal_unix.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/grumble/grumble.go b/cmd/grumble/grumble.go
index c47e2de..6d2c93a 100644
--- a/cmd/grumble/grumble.go
+++ b/cmd/grumble/grumble.go
@@ -37,14 +37,14 @@ func main() {
dataDir.Close()
// Set up logging
- err = logtarget.Target.OpenFile(Args.LogPath)
+ err = logtarget.Default.OpenFile(Args.LogPath)
if err != nil {
fmt.Fprintf(os.Stderr, "Unable to open log file (%v): %v", Args.LogPath, err)
return
}
log.SetPrefix("[G] ")
log.SetFlags(log.LstdFlags | log.Lmicroseconds)
- log.SetOutput(logtarget.Target)
+ log.SetOutput(logtarget.Default)
log.Printf("Grumble")
log.Printf("Using data directory: %s", Args.DataDir)
diff --git a/cmd/grumble/server.go b/cmd/grumble/server.go
index 7877830..4f2bb4d 100644
--- a/cmd/grumble/server.go
+++ b/cmd/grumble/server.go
@@ -156,7 +156,7 @@ func NewServer(id int64) (s *Server, err error) {
s.Channels[0] = NewChannel(0, "Root")
s.nextChanId = 1
- s.Logger = log.New(logtarget.Target, fmt.Sprintf("[%v] ", s.Id), log.LstdFlags|log.Lmicroseconds)
+ s.Logger = log.New(logtarget.Default, fmt.Sprintf("[%v] ", s.Id), log.LstdFlags|log.Lmicroseconds)
return
}
diff --git a/cmd/grumble/signal_unix.go b/cmd/grumble/signal_unix.go
index 7127f24..9066b49 100644
--- a/cmd/grumble/signal_unix.go
+++ b/cmd/grumble/signal_unix.go
@@ -20,7 +20,7 @@ func SignalHandler() {
signal.Notify(sigchan, syscall.SIGUSR2, syscall.SIGTERM, syscall.SIGINT)
for sig := range sigchan {
if sig == syscall.SIGUSR2 {
- err := logtarget.Target.Rotate()
+ err := logtarget.Default.Rotate()
if err != nil {
fmt.Fprintf(os.Stderr, "unable to rotate log file: %v", err)
}