upgdate log rotation

app/config/variant.go

@@ -1,10 +1,10 @@
 package config
 
 const (
-	confdir = "/usr/local/etc/mstore"
+	confdir = "/etc/mstore"
 	rundir  = "/var/run/mstore"
 	logdir  = "/var/log/mstore"
 	datadir = "/var/lib/mstore"
-	version = "0.2.0"
-        srvname = "mstored"
+	version = "0.2.3"
+	srvname = "mstored"
 )

app/server/server.go

@@ -12,12 +12,14 @@ package server
 
 import (
 	"context"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/signal"
 	"os/user"
 	"path/filepath"
 	"strconv"
+	"sync"
 	"syscall"
 	"time"
 
@@ -38,16 +40,20 @@ import (
 )
 
 type Server struct {
-	conf *config.Config
-	fiop *fileoper.Operator
-	acop *accoper.Operator
-	imop *imageoper.Operator
-	svc  *service.Service
-	mdb  *maindb.Database
-	hand *handler.Handler
-	logg *logger.Logger
-	stor *storage.Storage
-	stat descr.Server
+	conf   *config.Config
+	fiop   *fileoper.Operator
+	acop   *accoper.Operator
+	imop   *imageoper.Operator
+	svc    *service.Service
+	mdb    *maindb.Database
+	hand   *handler.Handler
+	logg   *logger.Logger
+	stor   *storage.Storage
+	stat   descr.Server
+	ctx    context.Context
+	cancel context.CancelFunc
+	wg     sync.WaitGroup
+	logf   *os.File
 }
 
 func NewServer() (*Server, error) {
@@ -97,7 +103,7 @@ func (srv *Server) Configure() error {
 	err = srv.conf.ReadConfigfile()
 	if err != nil {
 		srv.logg.Warningf("Error loading config file: %v", err)
-		//return err
+		err = nil
 	}
 	err = srv.conf.ReadX509Cert()
 	if err != nil {
@@ -327,6 +333,7 @@ func (srv *Server) Run() error {
 	}
 	srv.logg.Infof("Server run as user %s", currUser.Username)
 
+	srv.ctx, srv.cancel = context.WithCancel(context.Background())
 	svcDone := make(chan error, 1)
 
 	// Service run
@@ -341,17 +348,20 @@ func (srv *Server) Run() error {
 	go startService(srv.svc, svcDone)
 
 	sigs := make(chan os.Signal, 1)
-
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	var signal os.Signal
 
 	select {
 	case signal = <-sigs:
 		srv.logg.Infof("Services stopped by signal: %v", signal)
+		srv.cancel()
 		srv.svc.Stop()
+		srv.wg.Wait()
 	case err = <-svcDone:
 		srv.logg.Infof("Service stopped by service error: %v", err)
+		srv.cancel()
 		srv.svc.Stop()
+		srv.wg.Wait()
 	}
 	return err
 }
@@ -431,24 +441,7 @@ func (srv *Server) Daemonize() error {
 		if err != nil {
 			return err
 		}
-		// Log file rotator
-		logFunc := func() {
-			for {
-				stat, err := os.Stat(srv.conf.Logpath)
-				if err == nil && stat.Size() > srv.conf.LogLimit {
-					os.Rename(srv.conf.Logpath+".2", srv.conf.Logpath+".3")
-					os.Rename(srv.conf.Logpath+".1", srv.conf.Logpath+".2")
-					os.Rename(srv.conf.Logpath, srv.conf.Logpath+".1")
-					logFile.Close()
-					logFile, err = os.OpenFile(srv.conf.Logpath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0640)
-					syscall.Dup2(int(logFile.Fd()), int(os.Stdout.Fd()))
-					syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd()))
-					time.Sleep(10 * time.Second)
-				}
-
-			}
-		}
-		go logFunc()
+		srv.logf = logFile
 		// Write process ID
 		rundir := filepath.Dir(srv.conf.Runpath)
 		err = os.MkdirAll(rundir, 0750)
@@ -468,3 +461,42 @@ func (srv *Server) Daemonize() error {
 	}
 	return err
 }
+
+func (srv *Server) Rotator() {
+	srv.wg.Add(1)
+	var counter uint64
+	logFunc := func() {
+		for {
+			counter += 1
+			select {
+			case <-srv.ctx.Done():
+				srv.wg.Done()
+				srv.logg.Infof("Log file rotator done")
+				return
+			default:
+			}
+			if (counter % 60) == 1 {
+				stat, err := srv.logf.Stat()
+				if err == nil && stat.Size() > srv.conf.LogLimit {
+					srv.logg.Infof("Rotate log file")
+					countFiles := 3
+					for i := 1; i < countFiles; i++ {
+						nextName := fmt.Sprintf("%s.%d", srv.conf.Logpath, i+1)
+						prevName := fmt.Sprintf("%s.%d", srv.conf.Logpath, i)
+						os.Rename(prevName, nextName)
+					}
+					os.Rename(srv.conf.Logpath, srv.conf.Logpath+".1")
+					logFile, err := os.OpenFile(srv.conf.Logpath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0640)
+					if err == nil {
+						syscall.Dup2(int(logFile.Fd()), int(os.Stdout.Fd()))
+						syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd()))
+						srv.logf.Close()
+						srv.logf = logFile
+					}
+				}
+			}
+			time.Sleep(1 * time.Second)
+		}
+	}
+	go logFunc()
+}