1
0

Added a flag for logging to stdout that if set overrides configuration.

Substitute to user from config file.
Moved logging to own one.
This commit is contained in:
Alexander Andreev 2022-02-07 21:23:13 +04:00
parent 53bf25364a
commit 2fb9db01b0
Signed by: Arav
GPG Key ID: 1327FE8A374CC86F

View File

@ -2,16 +2,21 @@ package main
import ( import (
"dwelling-upload/internal/configuration" "dwelling-upload/internal/configuration"
"dwelling-upload/pkg/logging"
"dwelling-upload/pkg/utils" "dwelling-upload/pkg/utils"
"flag" "flag"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
"os/user"
"path" "path"
"strconv"
"syscall"
"time" "time"
) )
var configPath *string = flag.String("conf", "config.yaml", "path to configuration file") var configPath *string = flag.String("conf", "config.yaml", "path to configuration file")
var logToStdout *bool = flag.Bool("log-stdout", false, "write logs to stdout")
func main() { func main() {
flag.Parse() flag.Parse()
@ -20,11 +25,43 @@ func main() {
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
_ = config
// Substitute user to the one in config
dwu, err := user.Lookup(config.User)
if err != nil {
log.Fatalln(err)
}
dwuid, err := strconv.Atoi(dwu.Uid)
if err != nil {
log.Fatalln(err)
}
if os.Getuid() != dwuid {
if err := syscall.Setuid(dwuid); err != nil {
log.Fatalln(err)
}
}
if *logToStdout {
config.Log.ToStdout = true
}
logErr, err := logging.NewLogger(config.Log.CleanError, config.Log.ToStdout)
if err != nil {
log.Fatalln("failed to open error logger:", err)
}
defer logErr.Close()
logClean, err := logging.NewLogger(config.Log.Clean, config.Log.ToStdout)
if err != nil {
log.Fatalln("failed to open error logger:", err)
}
defer logClean.Close()
uploadsDir, err := ioutil.ReadDir(config.Uploads.Directory) uploadsDir, err := ioutil.ReadDir(config.Uploads.Directory)
if err != nil { if err != nil {
log.Fatalf("failed to open directory %s: %s\n", config.Uploads.Directory, err) logErr.Fatalf("failed to open directory %s: %s\n", config.Uploads.Directory, err)
} }
var deletedCount int64 = 0 var deletedCount int64 = 0
@ -33,7 +70,7 @@ func main() {
for _, entry := range uploadsDir { for _, entry := range uploadsDir {
if time.Duration(entry.ModTime().UTC().Sub(time.Now().UTC()).Hours()) >= time.Duration(config.Uploads.Limits.KeepForHours)*time.Hour { if time.Duration(entry.ModTime().UTC().Sub(time.Now().UTC()).Hours()) >= time.Duration(config.Uploads.Limits.KeepForHours)*time.Hour {
if err := os.Remove(path.Join(config.Uploads.Directory, entry.Name())); err != nil { if err := os.Remove(path.Join(config.Uploads.Directory, entry.Name())); err != nil {
log.Fatalln("failed to remove file ", entry.Name(), ": ", err) logErr.Fatalln("failed to remove file ", entry.Name(), ": ", err)
} }
deletedSize += entry.Size() deletedSize += entry.Size()
deletedCount++ deletedCount++
@ -42,5 +79,5 @@ func main() {
_, _, cFSz := utils.ConvertFileSize(deletedSize) _, _, cFSz := utils.ConvertFileSize(deletedSize)
log.Println(deletedCount, "file(s) in total of", cFSz, "was removed during this run.") logClean.Println(deletedCount, "file(s) in total of", cFSz, "was removed during this run.")
} }