Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/Docker-setup/config.env
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ ELEVATE_DATA_CONTAINER_NAME=elevate-data

# Kafka-Topics
PROJECT_TOPIC=sl-improvement-project-submission-dev
METABASE_TOPIC=sl-improvement-metabase-dev
METABASE_TOPIC=sl-improvement-metabase-dev
4 changes: 2 additions & 2 deletions Documentation/Docker-setup/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ services:

# Elevate Data Service
elevate-data:
image: shikshalokamqa/elevate-data:latest
image: shikshalokamqa/elevate-data:v3.0.2
restart: always
container_name: elevate-data
ports:
Expand Down Expand Up @@ -178,4 +178,4 @@ volumes:
elevate_data:
driver: local
kafka_data:
driver: local
driver: local
2 changes: 1 addition & 1 deletion jobs-core/src/main/resources/base-config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ task {
restart-strategy.attempts = 3
restart-strategy.delay = 30000 # in milli-seconds
consumer.parallelism = 1
}
}
12 changes: 12 additions & 0 deletions jobs-core/src/main/scala/org/shikshalokam/job/BaseJobConfig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ class BaseJobConfig(val config: Config, val jobName: String) extends Serializabl
properties.setProperty("bootstrap.servers", kafkaBrokerServers)
properties.setProperty("group.id", groupId)
properties.setProperty(ConsumerConfig.ISOLATION_LEVEL_CONFIG, "read_committed")

// Add timeout configurations to handle connection issues better
// Default timeout is 30 seconds, increase to 60 seconds for better reliability
// properties.setProperty(ConsumerConfig.REQUEST_TIMEOUT_MS_CONFIG, "60000")
// properties.setProperty(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000")
// properties.setProperty(ConsumerConfig.METADATA_MAX_AGE_CONFIG, "300000")

kafkaAutoOffsetReset.map {
properties.setProperty("auto.offset.reset", _)
}
Expand All @@ -50,6 +57,11 @@ class BaseJobConfig(val config: Config, val jobName: String) extends Serializabl
properties.put(ProducerConfig.LINGER_MS_CONFIG, new Integer(10))
properties.put(ProducerConfig.BATCH_SIZE_CONFIG, new Integer(16384 * 4))
properties.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, "snappy")

// Add timeout configurations for producer
// properties.setProperty(ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG, "60000")
// properties.setProperty(ProducerConfig.DELIVERY_TIMEOUT_MS_CONFIG, "120000")

properties
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ metabase {
domainName = "http://localhost:3000/dashboard/"
metabaseApiKey = "d3f4ult-api-key"
evidenceBaseUrl = "https://elevate-api.sunbirdsaas.com/project/v1/cloud-services/files/download?file="
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ metabase {
domainName = "http://localhost:3000/dashboard/"
metabaseApiKey = "d3f4ult-api-key"
evidenceBaseUrl = "https://TESTING="
}
}
1 change: 1 addition & 0 deletions stream-jobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<module>survey-stream-processor</module>
<module>observation-stream-processor</module>
<module>user-stream-processor</module>
<module>user-mapping-stream-processor</module>
<module>mentoring-stream-processor</module>
</modules>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ postgres{

reports{
enabled = ["admin", "state", "district", "program", "solution"]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ postgres{

reports{
enabled = ["admin", "state", "district", "program", "solution"]
}
}
Loading