update package to follow naming convesions better: cmd -> daemon

Author: crimist

cli/cmd_backup.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/crimist/trakx/cmd"
+	"github.com/crimist/trakx/daemon"
 )
 
 func newBackupRootCommand() *Command {
@@ -46,7 +46,7 @@ func exportSubcommand() *Command {
 				out = file
 			}
 
-			if err := cmd.ExportBackup(conf, out); err != nil {
+			if err := daemon.ExportBackup(conf, out); err != nil {
 				return err
 			}
 			if *outPath != "" {
@@ -85,7 +85,7 @@ func importSubcommand() *Command {
 				in = file
 			}
 
-			if err := cmd.ImportBackup(conf, in); err != nil {
+			if err := daemon.ImportBackup(conf, in); err != nil {
 				return err
 			}
 			if *inPath != "" {

cli/cmd_run.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/crimist/trakx/cmd"
+	"github.com/crimist/trakx/daemon"
 )
 
 func newRunCommand() *Command {
@@ -36,7 +36,7 @@ func newRunCommand() *Command {
 				}
 			}
 
-			cmd.RunWithOptions(conf, cmd.RunOptions{
+			daemon.RunWithOptions(conf, daemon.RunOptions{
 				ImportReader: importReader,
 			})
 			return nil

cli/daemon.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/crimist/trakx/cmd"
+	"github.com/crimist/trakx/daemon"
 	"github.com/crimist/trakx/config"
 	"github.com/crimist/trakx/tracker/udp/udpprotocol"
 	"github.com/pkg/errors"
@@ -34,7 +34,7 @@ func newDaemonController(conf *config.Configuration) *daemonController {
 }
 
 func (controller *daemonController) Execute() {
-	cmd.Run(controller.config)
+	daemon.Run(controller.config)
 }
 
 func (controller *daemonController) Start(opts GlobalOptions, importPath string) error {
@@ -76,7 +76,7 @@ func (controller *daemonController) Stop(out io.Writer) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to get process from process id file")
 	}
-	if err := process.Signal(cmd.SigStop); err != nil {
+	if err := process.Signal(daemon.SigStop); err != nil {
 		return errors.Wrap(err, "failed to send stop signal to process")
 	}
 

cmd/backup.go daemon/backup.gocmd/backup.go renamed to daemon/backup.go

@@ -1,4 +1,4 @@
-package cmd
+package daemon
 
 import (
 	"fmt"

cmd/backup_test.go daemon/backup_test.gocmd/backup_test.go renamed to daemon/backup_test.go

@@ -1,4 +1,4 @@
-package cmd
+package daemon
 
 import (
 	"bytes"

cmd/main_test.go daemon/main_test.gocmd/main_test.go renamed to daemon/main_test.go

@@ -1,4 +1,4 @@
-package cmd
+package daemon
 
 import (
 	"fmt"

cmd/pprof.go daemon/pprof.gocmd/pprof.go renamed to daemon/pprof.go

@@ -1,4 +1,4 @@
-package cmd
+package daemon
 
 import (
 	"fmt"

cmd/run.go daemon/run.gocmd/run.go renamed to daemon/run.go

@@ -1,4 +1,4 @@
-package cmd
+package daemon
 
 import (
 	"expvar"
@@ -139,7 +139,7 @@ func RunWithOptions(conf *config.Configuration, opts RunOptions) {
 		}()
 	}
 
-	go signalHandler(db, trackers, func() error {
+	go signalHandler(trackers, func() error {
 		return persistDatabase(db, conf.DB.Backup.Path)
 	})
 

cmd/signals.go daemon/signals.gocmd/signals.go renamed to daemon/signals.go

@@ -1,11 +1,10 @@
-package cmd
+package daemon
 
 import (
 	"os"
 	"os/signal"
 	"syscall"
 
-	"github.com/crimist/trakx/storage"
 	"github.com/crimist/trakx/tracker"
 
 	"go.uber.org/zap"
@@ -16,7 +15,7 @@ var SigStop = os.Interrupt
 
 const exitSuccess = 0
 
-func signalHandler(db storage.Database, trackers []tracker.Tracker, persist func() error) {
+func signalHandler(trackers []tracker.Tracker, persist func() error) {
 	signalChannel := make(chan os.Signal, 1)
 	signal.Notify(signalChannel, os.Interrupt, syscall.SIGTERM, syscall.SIGUSR1)