Merge pull request #987 from asynkron/update-examples-to-new-protoc

update generated code
asynkron · Dec 16, 2023 · a46b643 · a46b643
2 parents 7b6b1f5 + 661566d
commit a46b643
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 641 deletions.
diff --git a/_examples/cluster-broadcast/shared/build.sh b/_examples/cluster-broadcast/shared/build.sh
@@ -1,2 +1,2 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=.  --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
diff --git a/...ter-broadcast/shared/protos_protoactor.go → ...uster-broadcast/shared/protos_grain.pb.go b/...ter-broadcast/shared/protos_protoactor.go → ...uster-broadcast/shared/protos_grain.pb.go
diff --git a/_examples/cluster-grain/shared/build.sh b/_examples/cluster-grain/shared/build.sh
@@ -1,2 +1,2 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=. -I=$GOPATH/src --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
diff --git a/...cluster-grain/shared/protos_protoactor.go → ...s/cluster-grain/shared/protos_grain.pb.go b/...cluster-grain/shared/protos_protoactor.go → ...s/cluster-grain/shared/protos_grain.pb.go
diff --git a/_examples/cluster-metrics/shared/build.sh b/_examples/cluster-metrics/shared/build.sh
@@ -1,2 +1,2 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=.  --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
diff --git a/...uster-metrics/shared/protos_protoactor.go → ...cluster-metrics/shared/protos_grain.pb.go b/...uster-metrics/shared/protos_protoactor.go → ...cluster-metrics/shared/protos_grain.pb.go
diff --git a/_examples/cluster-pubsub/build.sh b/_examples/cluster-pubsub/build.sh
@@ -1,2 +1,2 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=.  --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
diff --git a/_examples/cluster-pubsub/protos_protoactor.go b/_examples/cluster-pubsub/protos_protoactor.go
diff --git a/_examples/cluster-restartgracefully/shared/build.sh b/_examples/cluster-restartgracefully/shared/build.sh
@@ -1,2 +1,2 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=.  --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
diff --git a/...artgracefully/shared/protos_protoactor.go → ...startgracefully/shared/protos_grain.pb.go b/...artgracefully/shared/protos_protoactor.go → ...startgracefully/shared/protos_grain.pb.go
diff --git a/actor/actor_context.go b/actor/actor_context.go
@@ -648,7 +648,7 @@ func (ctx *actorContext) stopAllChildren() {
 		return
 	}
 
-	var pids = ctx.extras.children.pids
+	pids := ctx.extras.children.pids
 	for i := len(pids) - 1; i >= 0; i-- {
 		pids[i].sendSystemMessage(ctx.actorSystem, stopMessage)
 	}
@@ -706,7 +706,7 @@ func (ctx *actorContext) finalizeStop() {
 //
 
 func (ctx *actorContext) EscalateFailure(reason interface{}, message interface{}) {
-	//TODO: add callstack to log?
+	// TODO: add callstack to log?
 	ctx.Logger().Info("[ACTOR] Recovering", slog.Any("self", ctx.self), slog.Any("reason", reason))
 	// debug setting, allows to output supervision failures in console/error level
 	if ctx.actorSystem.Config.DeveloperSupervisionLogging {

diff --git a/protobuf/protoc-gen-gograinv2/Makefile b/protobuf/protoc-gen-gograinv2/Makefile