Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ import (
)

func main() {
logger.Init()

setup, err := utils.ParseSetupFile()
if err != nil {
logger.Critical(err)
fmt.Fprintf(os.Stderr, "ERROR: Cannot read %s: %v\n", utils.CONF, err)
os.Exit(1)
}

logger.Init(setup.LogFile)
defer logger.Close()

if setup.Socket == "" {
setup.Socket = fmt.Sprintf("/tmp/taskmasterd-%d.sock", os.Getpid())
}
Expand Down
37 changes: 36 additions & 1 deletion internal/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"log/syslog"
"os"
"path/filepath"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -40,11 +41,12 @@ type Logger struct {
level LogLevel
mutex sync.Mutex
syslogger *syslog.Writer
file *os.File
}

var logger Logger

func Init() {
func Init(logfile string) {
syslogger, err := syslog.New(syslog.LOG_INFO, "taskmaster")

if err != nil {
Expand All @@ -61,9 +63,38 @@ func Init() {
level = lvl
}

var file *os.File

if logfile != "" {
if dir := filepath.Dir(logfile); dir != "." {
if err := os.Mkdir(dir, 0755); err != nil {
fmt.Fprintf(os.Stderr, "ERROR: CAnnot create logfile directory %q: %v\n", dir, err)
os.Exit(1)
}
}

file, err = os.OpenFile(logfile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)

if err != nil {
fmt.Fprintf(os.Stderr, "ERROR: Cannot open logfile %q: %v\n", logfile, err)
os.Exit(1)
}
}

logger = Logger{
level: level,
syslogger: syslogger,
file: file,
}
}

func Close() {
logger.mutex.Lock()
defer logger.mutex.Unlock()

if logger.file != nil {
logger.file.Close()
logger.file = nil
}
}

Expand Down Expand Up @@ -170,4 +201,8 @@ func (l *Logger) log(level LogLevel, a any) {
defer l.mutex.Unlock()

fmt.Println(message)

if l.file != nil {
fmt.Fprintln(l.file, message)
}
}
9 changes: 5 additions & 4 deletions internal/utils/setup.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package utils

import (
"os/user"
"strconv"
"syscall"
"os/user"

"github.com/Archer-01/taskmaster/internal/parser/config"
"github.com/BurntSushi/toml"
)

type Setup struct {
Prompt string `toml:"prompt"`
Socket string `toml:"socket"`
Config string `toml:"config" validate:"default=taskmaster.toml"`
Prompt string `toml:"prompt"`
Socket string `toml:"socket"`
Config string `toml:"config" validate:"default=taskmaster.toml"`
LogFile string `toml:"logfile"`
}

const (
Expand Down
1 change: 1 addition & 0 deletions setup.toml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
prompt = "taskmaster> "
logfile = "/log/taskmaster.log"
Loading