Move lock file from /tmp to /var/run/lock. Do not run logrotate immed…

…iately on boot. (#3250)

* Run logrotate after expected timeout to ensure systemd finishes its initial work and system is up. Move lock file from /tmp to /var/run/lock.

pkg/filelock/flock.go

@@ -36,7 +36,7 @@ type FileLock struct {
 func NewFileLock(lockName string) *FileLock {
 	return &FileLock{
 		LockName: lockName,
-		LockFile: filepath.Join(os.TempDir(), lockName),
+		LockFile: filepath.Join("/var/run/lock", lockName),
 	}
 }
 
@@ -65,6 +65,7 @@ func (fl *FileLock) Release() error {
 	if fl.fh == nil {
 		panic("Attempt to release not acquired lock!")
 	}
+	syscall.Flock(int(fl.fh.Fd()), syscall.LOCK_UN)
 	err := fl.fh.Close()
 	fl.fh = nil
 	fl.mu.Unlock()

pkg/logmgr/logmgr.go

@@ -169,16 +169,16 @@ func (lm *LogManager) Start() error {
 			for {
 				lm.loopsCount++
 				if lm.loopsCount%10 == 0 {
-					lm.op.Debugf("logrotate has been run %s times")
+					lm.op.Debugf("logrotate has been run %d times", lm.loopsCount)
 				}
-				lm.rotateLogs()
 				select {
 				case <-time.After(lm.runInterval):
 				case <-lm.closed:
 					lm.rotateLogs()
 					lm.wg.Done()
 					return
 				}
+				lm.rotateLogs()
 			}
 		}()
 	})