fix typo

Author: codemodify

AppServer/samples/sample.go

@@ -148,8 +148,8 @@ func main() {
 				Handler:  jsonRequestHandler,
 			},
 		}),
-		jm.NewWebScoketsServer([]jm.WebScoketsHandler{
-			jm.WebScoketsHandler{
+		jm.NewWebSocketsServer([]jm.WebSocketsHandler{
+			jm.WebSocketsHandler{
 				Route:   "/StreamTelemetry",
 				Handler: streamTelemetryRequestHandler,
 			},

AppServer/tests/ws_test.go

@@ -42,8 +42,8 @@ func NewWebSocketTransport(port int, messageEventHandler OnMessageEventHandler)
 }
 
 func (thisRef WebSocketTransport) Serve() error {
-	thisRef.server = appS.NewWebScoketsServer([]appS.WebScoketsHandler{
-		appS.WebScoketsHandler{
+	thisRef.server = appS.NewWebSocketsServer([]appS.WebSocketsHandler{
+		appS.WebSocketsHandler{
 			Route:   "/",
 			Handler: thisRef.rawRequestHandler,
 		},

AppServer/web-sockets.go

@@ -15,28 +15,28 @@ import (
 // WebScoketsRequestHandler -
 type WebScoketsRequestHandler func(inChannel chan []byte, outChannel chan []byte)
 
-// WebScoketsHandler -
-type WebScoketsHandler struct {
+// WebSocketsHandler -
+type WebSocketsHandler struct {
 	Route   string
 	Handler WebScoketsRequestHandler
 }
 
 // WebScoketsServer -
 type WebScoketsServer struct {
-	handlers       []WebScoketsHandler
-	routeToHandler map[string]WebScoketsHandler
+	handlers       []WebSocketsHandler
+	routeToHandler map[string]WebSocketsHandler
 	HTTPServer     IServer
 	peers          []*websocket.Conn
 	peersSync      sync.RWMutex
 	enableCORS     bool
 }
 
-// NewWebScoketsServer -
-func NewWebScoketsServer(handlers []WebScoketsHandler) IServer {
+// NewWebSocketsServer -
+func NewWebSocketsServer(handlers []WebSocketsHandler) IServer {
 
 	var thisRef = &WebScoketsServer{
 		handlers:       handlers,
-		routeToHandler: map[string]WebScoketsHandler{},
+		routeToHandler: map[string]WebSocketsHandler{},
 		HTTPServer:     nil,
 		peers:          []*websocket.Conn{},
 		peersSync:      sync.RWMutex{},
@@ -45,7 +45,7 @@ func NewWebScoketsServer(handlers []WebScoketsHandler) IServer {
 	var lowLevelRequestHelper = func(rw http.ResponseWriter, r *http.Request) {
 		r.Header["Origin"] = nil
 
-		var handler WebScoketsHandler = thisRef.routeToHandler[r.URL.Path]
+		var handler WebSocketsHandler = thisRef.routeToHandler[r.URL.Path]
 
 		var upgrader = websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool { return thisRef.enableCORS },
@@ -92,7 +92,7 @@ func (thisRef *WebScoketsServer) RunOnExistingListenerAndRouter(listener net.Lis
 	thisRef.HTTPServer.RunOnExistingListenerAndRouter(listener, router, enableCORS)
 }
 
-func (thisRef *WebScoketsServer) setupCommunication(ws *websocket.Conn, handler *WebScoketsHandler) {
+func (thisRef *WebScoketsServer) setupCommunication(ws *websocket.Conn, handler *WebSocketsHandler) {
 	// DEBUG: fmt.Println("AppServer-WebScokets-DEBUG: setupCommunication - START")
 
 	thisRef.addPeer(ws)

Helpers/exec.go

@@ -51,16 +51,12 @@ func ExecInFolder(command string, folder string) (string, error) {
 		cmd.Dir = folder
 	}
 
-	bytes, err := cmd.CombinedOutput()
-	if err != nil {
-		return string(bytes), err
-	}
-
-	return string(bytes), nil
+	output, err := cmd.CombinedOutput()
+	return string(output), err
 }
 
 // ExecWithArgs -
 func ExecWithArgs(name string, args ...string) (out string, err error) {
-	stdout, err := exec.Command(name, args...).Output()
-	return string(stdout), err
+	output, err := exec.Command(name, args...).CombinedOutput()
+	return string(output), err
 }

Service/errors.go

@@ -0,0 +1,6 @@
+package Service
+
+import "errors"
+
+// ErrServiceDoesNotExist - system service does not exist
+var ErrServiceDoesNotExist = errors.New("ErrServiceDoesNotExist")

Service/system-service_linux.go

@@ -140,24 +140,33 @@ func (thisRef LinuxService) Stop() error {
 		"method":  helpersReflect.GetThisFuncName(),
 		"message": "stopping unit file with systemd",
 	})
-	_, err = runSystemCtlCommand("stop", thisRef.command.Name)
+
+	output, err := runSystemCtlCommand("stop", thisRef.command.Name)
 	if err != nil {
+		if strings.Contains(output, "Failed to stop") && strings.Contains(output, "not loaded") {
+			return ErrServiceDoesNotExist
+		}
+
 		return err
 	}
 
 	logging.Instance().LogDebugWithFields(loggingC.Fields{
 		"method":  helpersReflect.GetThisFuncName(),
 		"message": "disabling unit file with systemd",
 	})
-	_, err = runSystemCtlCommand("disable", thisRef.command.Name)
+	output, err = runSystemCtlCommand("disable", thisRef.command.Name)
 	if err != nil {
-		if strings.Contains(err.Error(), "Removed") {
-			logging.Instance().LogDebugWithFields(loggingC.Fields{
-				"method":  helpersReflect.GetThisFuncName(),
-				"message": "ignoring remove symlink error",
-			})
+		logging.Instance().LogWarningWithFields(loggingC.Fields{
+			"method":  helpersReflect.GetThisFuncName(),
+			"message": "stopping unit file with systemd",
+		})
+
+		if strings.Contains(output, "Failed to disable") && strings.Contains(output, "does not exist") {
+			return ErrServiceDoesNotExist
+		} else if strings.Contains(output, "Removed") {
 			return nil
 		}
+
 		return err
 	}
 

Service/tests/helpers.go

@@ -0,0 +1,19 @@
+package tests
+
+import (
+	"github.com/codemodify/SystemKit/Service"
+)
+
+func createService() Service.SystemService {
+	return Service.New(Service.ServiceCommand{
+		Name:             "systemkit-test-service",
+		DisplayLabel:     "SystemKit Test Service",
+		Description:      "SystemKit Test Service",
+		DocumentationURL: "",
+		Executable:       "/usr/bin/vim",
+		Args:             []string{""},
+		WorkingDirectory: "/tmp",
+		StdOutPath:       "null",
+		RunAsUser:        "user",
+	})
+}

Service/tests/sample-01_test.go

@@ -0,0 +1,19 @@
+package tests
+
+import (
+	"testing"
+
+	helpersErrors "github.com/codemodify/SystemKit/Helpers"
+	"github.com/codemodify/SystemKit/Service"
+)
+
+func Test_Uninstall(t *testing.T) {
+	service := createService()
+
+	err := service.Uninstall()
+	if helpersErrors.Is(err, Service.ErrServiceDoesNotExist) {
+		// INFO: this is a good thing
+	} else if err != nil {
+		t.Fatalf(err.Error())
+	}
+}