fix(server): apply default policy to workspaces

reearth · Oct 4, 2023 · 8b1ef4a · 8b1ef4a
1 parent 4c7a8f3
commit 8b1ef4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/server/go.mod b/server/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/paulmach/go.geojson v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/ravilushqa/otelgqlgen v0.8.0
-	github.com/reearth/reearthx v0.0.0-20231004111936-81f4cb96b88f
+	github.com/reearth/reearthx v0.0.0-20231004123029-4aa43e69662a
 	github.com/samber/lo v1.27.0
 	github.com/spf13/afero v1.9.3
 	github.com/square/mongo-lock v0.0.0-20201208161834-4db518ed7fb2

diff --git a/server/go.sum b/server/go.sum
@@ -493,18 +493,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/ravilushqa/otelgqlgen v0.8.0 h1:x48k+D1GMgm87xhMO2Lekrr9YGzFbpG3yijn9GpxuAY=
 github.com/ravilushqa/otelgqlgen v0.8.0/go.mod h1:6JO5YO2iY4POC7R6yB/L/RKXCcyISL8qQt5NnHOhh0o=
-github.com/reearth/reearthx v0.0.0-20230825072907-543ac159f33b h1:7IsqB7KdGzp0hwlOIGb2imQW8mWJ9Ua9Ad5pAGNYaRs=
-github.com/reearth/reearthx v0.0.0-20230825072907-543ac159f33b/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
-github.com/reearth/reearthx v0.0.0-20231004085546-58d2b9a580d3 h1:OWXYkQ7IafOuhLAB6h+M/lUmHoYfSWrPaExkq7PxT5I=
-github.com/reearth/reearthx v0.0.0-20231004085546-58d2b9a580d3/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
-github.com/reearth/reearthx v0.0.0-20231004090951-7e7cbfdb49ba h1:O+R6Pjm5gwPSjedbygWBwjtN7BW4bKw0n5NX+8Szxpg=
-github.com/reearth/reearthx v0.0.0-20231004090951-7e7cbfdb49ba/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
-github.com/reearth/reearthx v0.0.0-20231004095401-bceec5158e2a h1:/aUjXiRKu+YlbhOmiNnCKgtjJqvomQsMg2PNDX655Wc=
-github.com/reearth/reearthx v0.0.0-20231004095401-bceec5158e2a/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
-github.com/reearth/reearthx v0.0.0-20231004110218-b02e3f864b80 h1:a+bsD5ASDbNUDhNPN+IEPKl8fBmwtPqhkOlb3mWUsdg=
-github.com/reearth/reearthx v0.0.0-20231004110218-b02e3f864b80/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
-github.com/reearth/reearthx v0.0.0-20231004111936-81f4cb96b88f h1:k2PShuS6Rfj7i5HlHXht5vNghi4/s0osSsQs4Dj2mco=
-github.com/reearth/reearthx v0.0.0-20231004111936-81f4cb96b88f/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
+github.com/reearth/reearthx v0.0.0-20231004123029-4aa43e69662a h1:5p6Q3BS4+K/mIDERe766q6ZvLgYDPsao7Sfbrn0rD2c=
+github.com/reearth/reearthx v0.0.0-20231004123029-4aa43e69662a/go.mod h1:b8EygPZ9VcMv9vTbnl/oz3PU/wHz3wpBa4rc7W7URjw=
 github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

diff --git a/server/internal/infrastructure/mongo/lock.go b/server/internal/infrastructure/mongo/lock.go
@@ -40,18 +40,18 @@ func (r *Lock) Lock(ctx context.Context, name string) error {
 	}
 
 	lockID := uuid.NewString()
-	log.Infofc(ctx, "lock: trying to lock: id=%s, name=%s, host=%s", name, lockID, r.hostid)
+	log.Debugfc(ctx, "lock: trying to lock: id=%s, name=%s, host=%s", name, lockID, r.hostid)
 
 	if err := retry.Do(
 		func() error { return r.l.XLock(ctx, name, lockID, r.details()) },
 		retry.RetryIf(func(err error) bool { return errors.Is(err, lock.ErrAlreadyLocked) }),
 	); err != nil {
-		log.Infofc(ctx, "lock: failed to lock: name=%s, id=%s, host=%s, err=%s", name, lockID, r.hostid, err)
+		log.Debugfc(ctx, "lock: failed to lock: name=%s, id=%s, host=%s, err=%s", name, lockID, r.hostid, err)
 		return repo.ErrFailedToLock
 	}
 
 	r.setLockID(name, lockID)
-	log.Infofc(ctx, "lock: locked: name=%s, id=%s, host=%s", name, lockID, r.hostid)
+	log.Debugfc(ctx, "lock: locked: name=%s, id=%s, host=%s", name, lockID, r.hostid)
 	return nil
 }
 
@@ -66,7 +66,7 @@ func (r *Lock) Unlock(ctx context.Context, name string) error {
 	}
 
 	r.deleteLockID(name)
-	log.Infofc(ctx, "lock: unlocked: name=%s, id=%s, host=%s", name, lockID, r.hostid)
+	log.Debugfc(ctx, "lock: unlocked: name=%s, id=%s, host=%s", name, lockID, r.hostid)
 	return nil
 }