fix: deadlock #4

change.go

@@ -7,25 +7,21 @@ import (
 	"github.com/r3labs/diff/v3"
 )
 
-func (s *Settings[C]) setConfigInternal(config C, lock bool) *Settings[C] {
-
-	var (
-		changelog diff.Changelog
-		err       error
-	)
-
-	if lock {
-		s.Lock()
-	}
-
-	defer func() {
+func (s *Settings[C]) notifyHooks(changelog diff.Changelog) {
 
 	if len(changelog) > 0 {
 		s.notifyPostprocessingHooks(changelog)
 		s.notifyChangeHooks(changelog)
 	}
 
-	}()
+}
+
+func (s *Settings[C]) setConfigInternal(config C) (*Settings[C], diff.Changelog) {
+
+	var (
+		changelog diff.Changelog
+		err       error
+	)
 
 	errorCount := len(s.errors)
 	defer func() {
@@ -34,21 +30,15 @@ func (s *Settings[C]) setConfigInternal(config C, lock bool) *Settings[C] {
 		}
 	}()
 
-	defer func() {
-		if lock {
-			s.Unlock()
-		}
-	}()
-
 	if err := validateConfig[C](config); err != nil {
 		s.errors = append(s.errors, err)
-		return s
+		return s, changelog
 	}
 
 	d, err := diff.NewDiffer()
 	if err != nil {
 		s.errors = append(s.errors, err)
-		return s
+		return s, changelog
 	}
 
 	d.ConvertCompatibleTypes = true
@@ -57,13 +47,19 @@ func (s *Settings[C]) setConfigInternal(config C, lock bool) *Settings[C] {
 	changelog, err = d.Diff(s.config, config)
 	if err != nil {
 		s.errors = append(s.errors, err)
-		return s
+		return s, changelog
 	}
 
 	s.config = config
-	return s
+	return s, changelog
 }
 
 func (s *Settings[C]) SetConfig(config C) *Settings[C] {
-	return s.setConfigInternal(config, true)
+	s.Lock()
+	c, l := s.setConfigInternal(config)
+	s.Unlock()
+
+	s.notifyHooks(l)
+
+	return c
 }

copyable.go

@@ -7,15 +7,14 @@ import (
 	"gitlab.schukai.com/oss/libraries/go/utilities/pathfinder"
 )
 
-// // Copy implements the xflags.Copyable interface.
+// Copy implements the xflags.Copyable interface.
 func (s *Settings[C]) Copy(m map[string]any) {
 
 	if s == nil {
-		panic("struct is not initialized")
+		panic("cannot copy nil")
 	}
 
 	s.Lock()
-	defer s.Unlock()
 
 	errorCount := len(s.errors)
 	defer func() {
@@ -37,6 +36,9 @@ func (s *Settings[C]) Copy(m map[string]any) {
 		}
 	}
 
-	s.setConfigInternal(c, false)
+	_, l := s.setConfigInternal(c)
+	s.Unlock()
+
+	s.notifyHooks(l)
 
 }

devenv.nix

@@ -3,34 +3,34 @@
 {
 
   # https://devenv.sh/packages/
-  packages = [
+  packages = with pkgs; [
     inputs.version.defaultPackage."${builtins.currentSystem}"
-    pkgs.git
-    pkgs.gcc12
-    pkgs.go-task
-    pkgs.blackbox
-    pkgs.blackbox-terminal
-    pkgs.jq
-    pkgs.delve
-    pkgs.gdlv
-    pkgs.wget
-    pkgs.glab
-    pkgs.unixtools.xxd
-    pkgs.libffi
-    pkgs.zlib
-    pkgs.procps
-    pkgs.php81Extensions.xdebug
-    pkgs.ranger
-    pkgs.meld
-    pkgs.gnused
-    pkgs.coreutils-full
-    pkgs.gnugrep
-    pkgs.gnumake
-    pkgs.util-linux
-    pkgs.httpie
-    pkgs.netcat
-    pkgs.memcached
-    pkgs.fd    
+    git
+    gcc12
+    go-task
+    blackbox
+    blackbox-terminal
+    jq
+    delve
+    gdlv
+    wget
+    glab
+    unixtools.xxd
+    libffi
+    zlib
+    procps
+    php81Extensions.xdebug
+    ranger
+    meld
+    gnused
+    coreutils-full
+    gnugrep
+    gnumake
+    util-linux
+    httpie
+    netcat
+    memcached
+    fd    
   ];
 
 
@@ -65,7 +65,7 @@ PATH="''${PATH}":${pkgs.git}/bin/
 PATH="''${PATH}":${pkgs.gnugrep}/bin/
 PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/
 
-export -f PATH
+export PATH
 
 task test
 

http-handler.go

@@ -83,7 +83,6 @@ func (s *Settings[C]) servePost(w http.ResponseWriter, r *http.Request) {
 	}
 
 	s.Lock()
-	defer s.Unlock()
 
 	b := s.config
 	s.importStream(rs)
@@ -91,7 +90,9 @@ func (s *Settings[C]) servePost(w http.ResponseWriter, r *http.Request) {
 	x := s.config
 	s.config = b
 
-	s.setConfigInternal(x, false)
+	_, l := s.setConfigInternal(x)
+	s.Unlock()
+	s.notifyHooks(l)
 
 }
 

import.go

@@ -187,7 +187,6 @@ func (s *Settings[C]) importFiles() {
 func (s *Settings[C]) Import() *Settings[C] {
 
 	s.Lock()
-	defer s.Unlock()
 
 	errorCount := len(s.errors)
 	defer func() {
@@ -216,7 +215,9 @@ func (s *Settings[C]) Import() *Settings[C] {
 
 	x := s.config
 	s.config = defaults
-	s.setConfigInternal(x, false)
+	_, l := s.setConfigInternal(x)
+	s.Unlock()
+	s.notifyHooks(l)
 
 	return s
 }