Merge pull request #4 from an-prata/stop-comand

Stop comand

Author: an-prata

daemon/callbacks.go

@@ -21,6 +21,16 @@ func (r ReloadSignal) String() string {
 
 func (r ReloadSignal) Signal() {}
 
+// Represent a signal originating at a daemmon command and sent through a
+// channel by the stop callback
+type StopSignal struct{}
+
+func (r StopSignal) String() string {
+	return "Stop"
+}
+
+func (r StopSignal) Signal() {}
+
 // Returns a function that will sent the `server.Restart` constant through the
 // given channel when called.
 func GetRestartCallback(serverCommandChan chan server.ServerThreadCommand) DaemonCommandCallback {
@@ -39,6 +49,15 @@ func GetReloadCallback(signalChan chan os.Signal) DaemonCommandCallback {
 	}
 }
 
+// Returns a function that will send a `StopSignal` through the given channel
+// when called.
+func GetStopCallback(signalChan chan os.Signal) DaemonCommandCallback {
+	return func(_ DaemonCommandArg) error {
+		signalChan <- StopSignal{}
+		return nil
+	}
+}
+
 // Returns a function, that when called, will modify the given log's recording
 // log level to match its parameters.
 func GetLogPrintCallback(log *logger.Log) DaemonCommandCallback {

daemon/commands.go

@@ -115,3 +115,26 @@ func CmdRestart(socket net.Conn, log *logger.Log, arg bool) {
 		log.LogInfo("Restarted!")
 	}
 }
+
+// Sends the stop command to the daemon through the provided socket.
+//
+// This function is intended as the end of execution for the command it
+// represents and will therefore perform I/O operations, output to the user, and
+// indicate errors only though these means.
+func CmdStop(socket net.Conn, log *logger.Log, arg bool) {
+	if !arg {
+		return
+	}
+
+	log.LogInfo("Stopping webby...")
+
+	var buf [1]byte
+	socket.Write(append([]byte(Stop), 0))
+	socket.Read(buf[:])
+
+	if DaemonCommandSuccess(buf[0]) != Success {
+		log.LogErr("Could not stop webby")
+	} else {
+		log.LogInfo("Stopped!")
+	}
+}

daemon/listener.go

@@ -30,6 +30,9 @@ const (
 	// Reloads the configuration file and then restarts.
 	Reload = "reload"
 
+	// Stops the current daemon.
+	Stop = "stop"
+
 	// Sets the log level for recording logs to file. Should interperet its
 	// argument to be the desired log level.
 	LogRecord = "log-record"

daemon/proc.go

@@ -66,6 +66,7 @@ Start:
 	commandListener, err := NewDaemonListener(map[DaemonCommand]DaemonCommandCallback{
 		Restart:   GetRestartCallback(serverCommandChan),
 		Reload:    GetReloadCallback(signalChan),
+		Stop:      GetStopCallback(signalChan),
 		LogRecord: GetLogRecordCallback(&log),
 		LogPrint:  GetLogPrintCallback(&log),
 	}, log)

main.go

@@ -16,12 +16,14 @@ func main() {
 	var daemonProc bool
 	var reload bool
 	var restart bool
+	var stop bool
 	var logRecord string
 	var logPrint string
 
 	flag.BoolVar(&daemonProc, "daemon", false, "runs the webby server daemon process rather than behaving like a control application")
 	flag.BoolVar(&reload, "reload", false, "reloads the configuration file and then restarts, this will reset log levels")
 	flag.BoolVar(&restart, "restart", false, "restarts the webby HTTP server, rescanning directories")
+	flag.BoolVar(&stop, "stop", false, "stops the running daemon")
 	flag.StringVar(&logRecord, "log-record", "", "sets the log level to record to file, defaults to 'All'")
 	flag.StringVar(&logPrint, "log-print", "", "sets the log level to print to standard out, defaults to 'All'")
 
@@ -46,4 +48,5 @@ func main() {
 	daemon.CmdSetLogPrintLevel(socket, &log, logPrint)
 	daemon.CmdRestart(socket, &log, restart)
 	daemon.CmdReload(socket, &log, reload)
+	daemon.CmdStop(socket, &log, stop)
 }