Added a keyspace is set field

aswinbennyofficial · Nov 16, 2024 · aa5a333 · aa5a333
1 parent 10c9494
commit aa5a333
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -33,6 +33,7 @@ cassandra:
     - "cassandra-node1"
   port: 9042
   keyspace: "myapp_keyspace"
+  keyspace_isset: false
   username: "myapp_user"
   password: "your_secure_password"
   consistency: "QUORUM"

diff --git a/src/cassandra/cassandra.go b/src/cassandra/cassandra.go
@@ -11,7 +11,9 @@ import (
 
 func NewCassandraConnection(config config.CassandraConfig, log zerolog.Logger) (*gocql.Session,error){
 	cluster:=gocql.NewCluster(config.Hosts...)
-	// cluster.Keyspace=config.Keyspace
+	if(config.IsKeySpaceSet){
+		cluster.Keyspace=config.Keyspace	
+	}
 	cluster.Port=config.Port
 	cluster.Consistency=gocql.Quorum
 	if config.Username!="" && config.Password!="" {
@@ -32,15 +34,17 @@ func NewCassandraConnection(config config.CassandraConfig, log zerolog.Logger) (
 		session, err = cluster.CreateSession()
 		if err == nil {
 			log.Info().Msgf("Connected to Cassandra on attempt %d", attempt)
-			if err=ensureKeyspace(session, config, log);err!=nil{
-				return nil,err
-			}
-			session.Close()
-
-			cluster.Keyspace = config.Keyspace
-			session, err = cluster.CreateSession()
-			if err!=nil{
-				return nil,err
+			if(!config.IsKeySpaceSet){
+				if err=ensureKeyspace(session, config, log);err!=nil{
+					return nil,err
+				}
+				session.Close()
+
+				cluster.Keyspace = config.Keyspace
+				session, err = cluster.CreateSession()
+				if err!=nil{
+					return nil,err
+				}
 			}
 
 

diff --git a/src/config/config.go b/src/config/config.go
@@ -65,6 +65,7 @@ type CassandraConfig struct {
     Replication CasandraReplication `mapstructure:"replication"`
     ProtoVersion int `mapstructure:"proto_version"`
     Migrations MigrationsConfig `mapstructure:"migrations"`
+    IsKeySpaceSet bool `mapstructure:"keyspace_isset"`
 }
 
 type CasandraReplication struct{