|
@@ -24,7 +24,7 @@ import (
|
|
|
"fmt"
|
|
"fmt"
|
|
|
"os"
|
|
"os"
|
|
|
"os/user"
|
|
"os/user"
|
|
|
- "path"
|
|
|
|
|
|
|
+ "path/filepath"
|
|
|
"strings"
|
|
"strings"
|
|
|
"sync"
|
|
"sync"
|
|
|
"time"
|
|
"time"
|
|
@@ -49,7 +49,7 @@ func createLogDirs() {
|
|
|
|
|
|
|
|
var (
|
|
var (
|
|
|
pid = os.Getpid()
|
|
pid = os.Getpid()
|
|
|
- program = path.Base(os.Args[0])
|
|
|
|
|
|
|
+ program = filepath.Base(os.Args[0])
|
|
|
host = "unknownhost"
|
|
host = "unknownhost"
|
|
|
userName = "unknownuser"
|
|
userName = "unknownuser"
|
|
|
)
|
|
)
|
|
@@ -107,10 +107,10 @@ func create(tag string, t time.Time) (f *os.File, filename string, err error) {
|
|
|
name, link := logName(tag, t)
|
|
name, link := logName(tag, t)
|
|
|
var lastErr error
|
|
var lastErr error
|
|
|
for _, dir := range logDirs {
|
|
for _, dir := range logDirs {
|
|
|
- fname := path.Join(dir, name)
|
|
|
|
|
|
|
+ fname := filepath.Join(dir, name)
|
|
|
f, err := os.Create(fname)
|
|
f, err := os.Create(fname)
|
|
|
if err == nil {
|
|
if err == nil {
|
|
|
- symlink := path.Join(dir, link)
|
|
|
|
|
|
|
+ symlink := filepath.Join(dir, link)
|
|
|
os.Remove(symlink) // ignore err
|
|
os.Remove(symlink) // ignore err
|
|
|
os.Symlink(fname, symlink) // ignore err
|
|
os.Symlink(fname, symlink) // ignore err
|
|
|
return f, fname, nil
|
|
return f, fname, nil
|