Merge branch 'master' into RestLightPush

.github/CODEOWNERS

@@ -0,0 +1 @@
+*  @richard-ramos @chaitanyaprem

cmd/waku/flags.go

@@ -121,6 +121,13 @@ var (
 		Destination: &options.KeyPasswd,
 		EnvVars:     []string{"WAKUNODE2_KEY_PASSWORD"},
 	})
+	ClusterID = altsrc.NewUintFlag(&cli.UintFlag{
+		Name:        "cluster-id",
+		Value:       0,
+		Usage:       "Cluster id that the node is running in. Node in a different cluster id is disconnected.",
+		Destination: &options.ClusterID,
+		EnvVars:     []string{"WAKUNODE2_CLUSTER_ID"},
+	})
 	StaticNode = cliutils.NewGenericFlagMultiValue(&cli.GenericFlag{
 		Name:  "staticnode",
 		Usage: "Multiaddr of peer to directly connect with. Option may be repeated",

cmd/waku/main.go

@@ -8,6 +8,8 @@ import (
 	"github.com/waku-org/go-waku/cmd/waku/keygen"
 	"github.com/waku-org/go-waku/cmd/waku/rlngenerate"
 	"github.com/waku-org/go-waku/waku/v2/node"
+	"github.com/waku-org/go-waku/waku/v2/utils"
+	"go.uber.org/zap"
 )
 
 var options NodeOptions
@@ -34,6 +36,7 @@ func main() {
 		NodeKey,
 		KeyFile,
 		KeyPassword,
+		ClusterID,
 		StaticNode,
 		KeepAlive,
 		PersistPeers,
@@ -113,7 +116,16 @@ func main() {
 		Before:  altsrc.InitInputSourceWithContext(cliFlags, altsrc.NewTomlSourceFromFlagFunc("config-file")),
 		Flags:   cliFlags,
 		Action: func(c *cli.Context) error {
-			Execute(options)
+			err := Execute(options)
+			if err != nil {
+				utils.Logger().Error("failure while executing wakunode", zap.Error(err))
+				switch e := err.(type) {
+				case cli.ExitCoder:
+					return e
+				case error:
+					return cli.Exit(err.Error(), 1)
+				}
+			}
 			return nil
 		},
 		Commands: []*cli.Command{